From 7cac5c3b84caa233cd846511bd2c9cffadf7741d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Santos?= Date: Tue, 10 Oct 2023 16:20:41 +0100 Subject: [PATCH] 117.2.4+g5053a95+chromium-117.0.5938.150 (#315) * upgrading Cef to 5845 * upgrading Cef to 5845 * Removing OnQuotaRequest * bump webview * bump webview * CEF 117.2.4+g5053a95+chromium-117.0.5938.150 Upgrade * Revert Sources * Remove Avalonia sources --- Directory.Build.props | 4 ++-- Nuget.config | 8 -------- .../WebView.InternalRequestHandler.cs | 17 +++++------------ 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 687e6b73..5781d459 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,13 +4,13 @@ net6.0 x64;ARM64 0.10.17 - 106.5249.22 + 117.5938.1 2.0.0.0 2.0.0.0 - 2.106.13 + 2.117.1 OutSystems WebViewControl Copyright © OutSystems 2023 diff --git a/Nuget.config b/Nuget.config index a68f9840..825afb98 100644 --- a/Nuget.config +++ b/Nuget.config @@ -14,19 +14,11 @@ - - - - - - - - \ No newline at end of file diff --git a/WebViewControl/WebView.InternalRequestHandler.cs b/WebViewControl/WebView.InternalRequestHandler.cs index b3b5ff1e..10872684 100644 --- a/WebViewControl/WebView.InternalRequestHandler.cs +++ b/WebViewControl/WebView.InternalRequestHandler.cs @@ -12,7 +12,7 @@ private class InternalRequestHandler : RequestHandler { private static readonly Lazy HttpResourceRequestHandler = new Lazy(() => new HttpResourceRequestHandler()); private WebView OwnerWebView { get; } - + private InternalResourceRequestHandler ResourceRequestHandler { get; } public InternalRequestHandler(WebView webView) { @@ -20,13 +20,6 @@ public InternalRequestHandler(WebView webView) { ResourceRequestHandler = new InternalResourceRequestHandler(OwnerWebView); } - protected override bool OnQuotaRequest(CefBrowser browser, string originUrl, long newSize, CefCallback callback) { - using (callback) { - callback.Continue(); - return true; - } - } - protected override bool GetAuthCredentials(CefBrowser browser, string originUrl, bool isProxy, string host, int port, string realm, string scheme, CefAuthCallback callback) { using (callback) { if (OwnerWebView.ProxyAuthentication != null) { @@ -40,11 +33,11 @@ protected override bool OnBeforeBrowse(CefBrowser browser, CefFrame frame, CefRe if (UrlHelper.IsInternalUrl(request.Url)) { return false; } - + if (OwnerWebView.IsHistoryDisabled && request.TransitionType.HasFlag(CefTransitionType.ForwardBackFlag)) { return true; } - + var cancel = false; var beforeNavigate = OwnerWebView.BeforeNavigate; if (beforeNavigate != null) { @@ -91,7 +84,7 @@ protected override void OnRenderProcessTerminated(CefBrowser browser, CefTermina OwnerWebView.ForwardUnhandledAsyncException(exception); } - protected override CefResourceRequestHandler GetResourceRequestHandler(CefBrowser browser, CefFrame frame, CefRequest request, bool isNavigation, bool isDownload, string requestInitiator, ref bool disableDefaultHandling) { + protected override CefResourceRequestHandler GetResourceRequestHandler(CefBrowser browser, CefFrame frame, CefRequest request, bool isNavigation, bool isDownload, string requestInitiator, ref bool disableDefaultHandling) { if (OwnerWebView.IsSecurityDisabled && HttpResourceHandler.AcceptedResources.Contains(request.ResourceType) && request.Url != null) { var url = new Uri(request.Url); if (url.Scheme == Uri.UriSchemeHttp || url.Scheme == Uri.UriSchemeHttps) { @@ -102,4 +95,4 @@ protected override CefResourceRequestHandler GetResourceRequestHandler(CefBrowse } } } -} +} \ No newline at end of file