Attachment 345783 Details for Bug 188021 – Patch

[patch] Patch

bug-188021-20180725142749.patch (text/plain), 6.51 KB, created by Alex Christensen on 2018-07-25 14:27:49 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-07-25 14:27:49 PDT

Size: 6.51 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 234213)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,18 @@
>+2018-07-25  Alex Christensen  <achristensen@webkit.org>
>+
>+        Clean up WebGL load policy handlers
>+        https://bugs.webkit.org/show_bug.cgi?id=188021
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/API/APINavigationClient.h:
>+        (API::NavigationClient::webGLLoadPolicy const):
>+        (API::NavigationClient::resolveWebGLLoadPolicy const):
>+        * UIProcess/Cocoa/NavigationState.h:
>+        * UIProcess/Cocoa/NavigationState.mm:
>+        (WebKit::NavigationState::NavigationClient::webGLLoadPolicy const):
>+        (WebKit::NavigationState::NavigationClient::resolveWebGLLoadPolicy const):
>+
> 2018-07-25  Tim Horton  <timothy_horton@apple.com>
> 
>         Crashing on some builds that don't have async NSSharingService API
>Index: Source/WebKit/UIProcess/API/APINavigationClient.h
>===================================================================
>--- Source/WebKit/UIProcess/API/APINavigationClient.h	(revision 234209)
>+++ Source/WebKit/UIProcess/API/APINavigationClient.h	(working copy)
>@@ -124,8 +124,8 @@ public:
> #endif
> 
> #if ENABLE(WEBGL)
>-    virtual void webGLLoadPolicy(WebKit::WebPageProxy&, const WebCore::URL&, WTF::Function<void(WebCore::WebGLLoadPolicy)>&& completionHandler) const { completionHandler(WebCore::WebGLLoadPolicy::WebGLAllowCreation); }
>-    virtual void resolveWebGLLoadPolicy(WebKit::WebPageProxy&, const WebCore::URL&, WTF::Function<void(WebCore::WebGLLoadPolicy)>&& completionHandler) const { completionHandler(WebCore::WebGLLoadPolicy::WebGLAllowCreation); }
>+    virtual void webGLLoadPolicy(WebKit::WebPageProxy&, const WebCore::URL&, CompletionHandler<void(WebCore::WebGLLoadPolicy)>&& completionHandler) const { completionHandler(WebCore::WebGLLoadPolicy::WebGLAllowCreation); }
>+    virtual void resolveWebGLLoadPolicy(WebKit::WebPageProxy&, const WebCore::URL&, CompletionHandler<void(WebCore::WebGLLoadPolicy)>&& completionHandler) const { completionHandler(WebCore::WebGLLoadPolicy::WebGLAllowCreation); }
> #endif
>     
>     virtual bool willGoToBackForwardListItem(WebKit::WebPageProxy&, WebKit::WebBackForwardListItem&, bool inPageCache, Object*) { return false; }
>Index: Source/WebKit/UIProcess/Cocoa/NavigationState.h
>===================================================================
>--- Source/WebKit/UIProcess/Cocoa/NavigationState.h	(revision 234209)
>+++ Source/WebKit/UIProcess/Cocoa/NavigationState.h	(working copy)
>@@ -124,8 +124,8 @@ private:
> #endif
> 
> #if PLATFORM(MAC)
>-        void webGLLoadPolicy(WebPageProxy&, const WebCore::URL&, WTF::Function<void(WebCore::WebGLLoadPolicy)>&& completionHandler) const final;
>-        void resolveWebGLLoadPolicy(WebPageProxy&, const WebCore::URL&, WTF::Function<void(WebCore::WebGLLoadPolicy)>&& completionHandler) const final;
>+        void webGLLoadPolicy(WebPageProxy&, const WebCore::URL&, CompletionHandler<void(WebCore::WebGLLoadPolicy)>&&) const final;
>+        void resolveWebGLLoadPolicy(WebPageProxy&, const WebCore::URL&, CompletionHandler<void(WebCore::WebGLLoadPolicy)>&&) const final;
>         bool willGoToBackForwardListItem(WebPageProxy&, WebBackForwardListItem&, bool inPageCache, API::Object*) final;
>         bool didFailToInitializePlugIn(WebPageProxy&, API::Dictionary&) final;
>         bool didBlockInsecurePluginVersion(WebPageProxy&, API::Dictionary&) final;
>Index: Source/WebKit/UIProcess/Cocoa/NavigationState.mm
>===================================================================
>--- Source/WebKit/UIProcess/Cocoa/NavigationState.mm	(revision 234209)
>+++ Source/WebKit/UIProcess/Cocoa/NavigationState.mm	(working copy)
>@@ -388,7 +388,7 @@ inline WebCore::WebGLLoadPolicy toWebCor
>     return WebCore::WebGLAllowCreation;
> }
> 
>-void NavigationState::NavigationClient::webGLLoadPolicy(WebPageProxy&, const WebCore::URL& url, WTF::Function<void(WebCore::WebGLLoadPolicy)>&& completionHandler) const
>+void NavigationState::NavigationClient::webGLLoadPolicy(WebPageProxy&, const WebCore::URL& url, CompletionHandler<void(WebCore::WebGLLoadPolicy)>&& completionHandler) const
> {
>     if (!m_navigationState.m_navigationDelegateMethods.webViewWebGLLoadPolicyForURL) {
>         completionHandler(WebGLAllowCreation);
>@@ -396,7 +396,7 @@ void NavigationState::NavigationClient::
>     }
> 
>     auto navigationDelegate = m_navigationState.m_navigationDelegate.get();
>-    Ref<CompletionHandlerCallChecker> checker = CompletionHandlerCallChecker::create(navigationDelegate.get(), @selector(_webView:webGLLoadPolicyForURL:decisionHandler:));
>+    auto checker = CompletionHandlerCallChecker::create(navigationDelegate.get(), @selector(_webView:webGLLoadPolicyForURL:decisionHandler:));
>     [(id <WKNavigationDelegatePrivate>)navigationDelegate _webView:m_navigationState.m_webView webGLLoadPolicyForURL:(NSURL *)url decisionHandler:BlockPtr<void(_WKWebGLLoadPolicy)>::fromCallable([completionHandler = WTFMove(completionHandler), checker = WTFMove(checker)](_WKWebGLLoadPolicy policy) {
>         if (checker->completionHandlerHasBeenCalled())
>             return;
>@@ -405,7 +405,7 @@ void NavigationState::NavigationClient::
>     }).get()];
> }
> 
>-void NavigationState::NavigationClient::resolveWebGLLoadPolicy(WebPageProxy&, const WebCore::URL& url, WTF::Function<void(WebCore::WebGLLoadPolicy)>&& completionHandler) const
>+void NavigationState::NavigationClient::resolveWebGLLoadPolicy(WebPageProxy&, const WebCore::URL& url, CompletionHandler<void(WebCore::WebGLLoadPolicy)>&& completionHandler) const
> {
>     if (!m_navigationState.m_navigationDelegateMethods.webViewResolveWebGLLoadPolicyForURL) {
>         completionHandler(WebGLAllowCreation);
>@@ -413,7 +413,7 @@ void NavigationState::NavigationClient::
>     }
>     
>     auto navigationDelegate = m_navigationState.m_navigationDelegate.get();
>-    Ref<CompletionHandlerCallChecker> checker = CompletionHandlerCallChecker::create(navigationDelegate.get(), @selector(_webView:resolveWebGLLoadPolicyForURL:decisionHandler:));
>+    auto checker = CompletionHandlerCallChecker::create(navigationDelegate.get(), @selector(_webView:resolveWebGLLoadPolicyForURL:decisionHandler:));
>     [(id <WKNavigationDelegatePrivate>)navigationDelegate _webView:m_navigationState.m_webView resolveWebGLLoadPolicyForURL:(NSURL *)url decisionHandler:BlockPtr<void(_WKWebGLLoadPolicy)>::fromCallable([completionHandler = WTFMove(completionHandler), checker = WTFMove(checker)](_WKWebGLLoadPolicy policy) {
>         if (checker->completionHandlerHasBeenCalled())
>             return;

Flags:

darin: review+
ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 188021: 345783 | 345809