Base64 encode then url encode html content in LoadHtml

Voltstro-Studios · Oct 16, 2024 · e9c8f53 · e9c8f53
1 parent 20edd9b
commit e9c8f53
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/UnityWebBrowser.Engine.Cef/Shared/Browser/UwbCefClient.cs b/src/UnityWebBrowser.Engine.Cef/Shared/Browser/UwbCefClient.cs
@@ -7,6 +7,7 @@
 using System.Collections.Generic;
 using System.Numerics;
 using System.Runtime.CompilerServices;
+using System.Text;
 using Microsoft.Extensions.Logging;
 using UnityWebBrowser.Engine.Cef.Shared.Browser.Js;
 using UnityWebBrowser.Engine.Cef.Shared.Browser.Messages;
@@ -289,7 +290,7 @@ public void ProcessMouseScrollEvent(MouseScrollEvent mouseScrollEvent)
     /// <param name="url"></param>
     public void LoadUrl(string url)
     {
-        browser.GetMainFrame()?.LoadUrl(url);
+        browser.GetMainFrame()!.LoadUrl(url);
     }
 
     /// <summary>
@@ -305,9 +306,12 @@ public Vector2 GetMouseScrollPosition()
     ///     Loads HTML content
     /// </summary>
     /// <param name="html"></param>
-    public void LoadHtml(string html)
+    public unsafe void LoadHtml(string html)
     {
-        browser.GetMainFrame()?.LoadUrl($"data:text/html,{html}");
+        html = CefRuntime.Base64Encode(Encoding.UTF8.GetBytes(html));
+        html = CefRuntime.UriEncode(html, false);
+
+        browser.GetMainFrame()!.LoadUrl($"data:text/html;base64,{html}");
     }
 
     /// <summary>
@@ -316,7 +320,7 @@ public void LoadHtml(string html)
     /// <param name="js"></param>
     public void ExecuteJs(string js)
     {
-        browser.GetMainFrame()?.ExecuteJavaScript(js, "", 0);
+        browser.GetMainFrame()!.ExecuteJavaScript(js, "", 0);
     }
 
     /// <summary>