Merge pull request #398 from threethan/cm-fix

(Desktop) Set UA via request handler instead of context: Fixes CookieManager

Author: KevinnZou

webview/src/desktopMain/kotlin/com/multiplatform/webview/web/CefRequestExt.kt

@@ -4,23 +4,36 @@ import com.multiplatform.webview.setting.WebSettings
 import dev.datlag.kcef.KCEFResourceRequestHandler
 import org.cef.browser.CefBrowser
 import org.cef.browser.CefFrame
-import org.cef.browser.CefRequestContext
+import org.cef.handler.CefRequestHandler
+import org.cef.handler.CefRequestHandlerAdapter
+import org.cef.handler.CefResourceRequestHandler
+import org.cef.misc.BoolRef
 import org.cef.network.CefRequest
 
-internal fun createModifiedRequestContext(settings: WebSettings): CefRequestContext {
-    return CefRequestContext.createContext { browser, frame, request, isNavigation, isDownload, requestInitiator, disableDefaultHandling ->
-        object : KCEFResourceRequestHandler(
-            getGlobalDefaultHandler(browser, frame, request, isNavigation, isDownload, requestInitiator, disableDefaultHandling),
-        ) {
-            override fun onBeforeResourceLoad(
-                browser: CefBrowser?,
-                frame: CefFrame?,
-                request: CefRequest?,
-            ): Boolean {
-                if (request != null) {
-                    settings.customUserAgentString?.let(request::setUserAgentString)
+internal fun createModifiedRequestHandler(settings: WebSettings): CefRequestHandler {
+    return object : CefRequestHandlerAdapter() {
+        override fun getResourceRequestHandler(
+            browser: CefBrowser?,
+            frame: CefFrame?,
+            request: CefRequest?,
+            isNavigation: Boolean,
+            isDownload: Boolean,
+            requestInitiator: String?,
+            disableDefaultHandling: BoolRef?,
+        ): CefResourceRequestHandler {
+            return object : KCEFResourceRequestHandler(
+                getGlobalDefaultHandler(browser, frame, request, isNavigation, isDownload, requestInitiator, disableDefaultHandling),
+            ) {
+                override fun onBeforeResourceLoad(
+                    browser: CefBrowser?,
+                    frame: CefFrame?,
+                    request: CefRequest?,
+                ): Boolean {
+                    if (request != null) {
+                        settings.customUserAgentString?.let(request::setUserAgentString)
+                    }
+                    return super.onBeforeResourceLoad(browser, frame, request)
                 }
-                return super.onBeforeResourceLoad(browser, frame, request)
             }
         }
     }

webview/src/desktopMain/kotlin/com/multiplatform/webview/web/WebView.desktop.kt

@@ -9,7 +9,6 @@ import dev.datlag.kcef.KCEF
 import dev.datlag.kcef.KCEFBrowser
 import dev.datlag.kcef.KCEFClient
 import org.cef.browser.CefRendering
-import org.cef.browser.CefRequestContext
 import java.util.concurrent.TimeUnit
 
 /**
@@ -53,7 +52,6 @@ actual class WebViewFactoryParam(
             CefRendering.DEFAULT
         }
     inline val transparent: Boolean get() = webSettings.desktopWebSettings.transparent
-    val requestContext: CefRequestContext get() = createModifiedRequestContext(webSettings)
 }
 
 actual class PlatformWebViewParams
@@ -62,33 +60,39 @@ actual class PlatformWebViewParams
 actual fun defaultWebViewFactory(param: WebViewFactoryParam): NativeWebView =
     when (val content = param.state.content) {
         is WebContent.Url ->
-            param.client.createBrowser(
-                content.url,
-                param.rendering,
-                param.transparent,
-                param.requestContext,
-            )
+            param.client
+                .also {
+                    it.addRequestHandler(createModifiedRequestHandler(param.webSettings))
+                }.createBrowser(
+                    content.url,
+                    param.rendering,
+                    param.transparent,
+                )
         is WebContent.Data ->
             param.client.createBrowser(
                 KCEFBrowser.BLANK_URI,
                 param.rendering,
                 param.transparent,
             )
         is WebContent.File -> {
-            param.client.createBrowser(
-                KCEFBrowser.BLANK_URI,
-                param.rendering,
-                param.transparent,
-                param.requestContext,
-            )
+            param.client
+                .also {
+                    it.addRequestHandler(createModifiedRequestHandler(param.webSettings))
+                }.createBrowser(
+                    KCEFBrowser.BLANK_URI,
+                    param.rendering,
+                    param.transparent,
+                )
         }
         else ->
-            param.client.createBrowser(
-                KCEFBrowser.BLANK_URI,
-                param.rendering,
-                param.transparent,
-                param.requestContext,
-            )
+            param.client
+                .also {
+                    it.addRequestHandler(createModifiedRequestHandler(param.webSettings))
+                }.createBrowser(
+                    KCEFBrowser.BLANK_URI,
+                    param.rendering,
+                    param.transparent,
+                )
     }
 
 /**