Attachment 348197 Details for Bug 189003 – Patch

[patch] Patch

bug-189003-20180827142408.patch (text/plain), 9.34 KB, created by Alex Christensen on 2018-08-27 14:24:09 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-08-27 14:24:09 PDT

Size: 9.34 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 235400)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,23 @@
>+2018-08-27  Alex Christensen  <achristensen@webkit.org>
>+
>+        Clean up WebGL policy getting code path
>+        https://bugs.webkit.org/show_bug.cgi?id=189003
>+
>+        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):
>+        * WebProcess/WebPage/WebPage.cpp:
>+        * WebProcess/WebPage/WebPage.h:
>+        * WebProcess/WebPage/ios/WebPageIOS.mm:
>+        (WebKit::WebPage::webGLPolicyForURL): Deleted.
>+        (WebKit::WebPage::resolveWebGLPolicyForURL): Deleted.
>+
> 2018-08-27  Alex Christensen  <achristensen@webkit.org>
> 
>         Pass webPageID and webFrameID to NetworkLoad for speculative loads
>Index: Source/WebKit/UIProcess/API/APINavigationClient.h
>===================================================================
>--- Source/WebKit/UIProcess/API/APINavigationClient.h	(revision 235398)
>+++ 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 235398)
>+++ Source/WebKit/UIProcess/Cocoa/NavigationState.h	(working copy)
>@@ -123,8 +123,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 235398)
>+++ Source/WebKit/UIProcess/Cocoa/NavigationState.mm	(working copy)
>@@ -391,7 +391,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);
>@@ -399,8 +399,8 @@ void NavigationState::NavigationClient::
>     }
> 
>     auto navigationDelegate = m_navigationState.m_navigationDelegate.get();
>-    Ref<CompletionHandlerCallChecker> 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) {
>+    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) mutable {
>         if (checker->completionHandlerHasBeenCalled())
>             return;
>         checker->didCallCompletionHandler();
>@@ -408,7 +408,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);
>@@ -416,8 +416,8 @@ void NavigationState::NavigationClient::
>     }
>     
>     auto navigationDelegate = m_navigationState.m_navigationDelegate.get();
>-    Ref<CompletionHandlerCallChecker> 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) {
>+    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) mutable {
>         if (checker->completionHandlerHasBeenCalled())
>             return;
>         checker->didCallCompletionHandler();
>Index: Source/WebKit/WebProcess/WebPage/WebPage.cpp
>===================================================================
>--- Source/WebKit/WebProcess/WebPage/WebPage.cpp	(revision 235398)
>+++ Source/WebKit/WebProcess/WebPage/WebPage.cpp	(working copy)
>@@ -882,7 +882,7 @@ RefPtr<Plugin> WebPage::createPlugin(Web
> }
> #endif // ENABLE(NETSCAPE_PLUGIN_API)
> 
>-#if ENABLE(WEBGL) && !PLATFORM(COCOA)
>+#if ENABLE(WEBGL) && !PLATFORM(MAC)
> WebCore::WebGLLoadPolicy WebPage::webGLPolicyForURL(WebFrame*, const URL&)
> {
>     return WebGLAllowCreation;
>Index: Source/WebKit/WebProcess/WebPage/WebPage.h
>===================================================================
>--- Source/WebKit/WebProcess/WebPage/WebPage.h	(revision 235398)
>+++ Source/WebKit/WebProcess/WebPage/WebPage.h	(working copy)
>@@ -1696,10 +1696,6 @@ private:
> 
>     uint64_t m_pendingNavigationID { 0 };
> 
>-#if ENABLE(WEBGL)
>-    WebCore::WebGLLoadPolicy m_systemWebGLPolicy { WebCore::WebGLAllowCreation };
>-#endif
>-
>     bool m_mainFrameProgressCompleted { false };
>     bool m_shouldDispatchFakeMouseMoveEvents { true };
>     bool m_isEditorStateMissingPostLayoutData { false };
>Index: Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm
>===================================================================
>--- Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm	(revision 235398)
>+++ Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm	(working copy)
>@@ -3014,18 +3014,6 @@ void WebPage::willStartUserTriggeredZoom
>     m_userHasChangedPageScaleFactor = true;
> }
> 
>-#if ENABLE(WEBGL)
>-WebCore::WebGLLoadPolicy WebPage::webGLPolicyForURL(WebFrame*, const URL&)
>-{
>-    return WebGLAllowCreation;
>-}
>-
>-WebCore::WebGLLoadPolicy WebPage::resolveWebGLPolicyForURL(WebFrame*, const URL&)
>-{
>-    return WebGLAllowCreation;
>-}
>-#endif
>-
> #if ENABLE(IOS_TOUCH_EVENTS)
> void WebPage::dispatchAsynchronousTouchEvents(const Vector<WebTouchEvent, 1>& queue)
> {

Actions: View | Formatted Diff | Diff

Attachments on bug 189003: 348196 | 348197