Attachment 347931 Details for Bug 188889 – Patch

[patch] Patch

bug-188889-20180823101759.patch (text/plain), 8.11 KB, created by Jeff Miller on 2018-08-23 10:18:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Miller

Created: 2018-08-23 10:18:00 PDT

Size: 8.11 KB

patch

obsolete

>Subversion Revision: 235227
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 04ab8224e2d8d9c2f4de2fdf28d0d7b35eec2e0f..e5da461cf0706786c847d74056b4169492d41b8c 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,23 @@
>+2018-08-23  Jeff Miller  <jeffm@apple.com>
>+
>+        Remove -[WKNavigationDelegate _webView:decidePolicyForPluginLoadWithCurrentPolicy:pluginInfo:unavailabilityDescription:]
>+        https://bugs.webkit.org/show_bug.cgi?id=188889
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h:
>+        Remove obsolete method.
>+
>+        * UIProcess/Cocoa/NavigationState.h:
>+        Remove obsolete flag.
>+
>+        * UIProcess/Cocoa/NavigationState.mm:
>+        (WebKit::NavigationState::setNavigationDelegate):
>+        Remove obsolete flag.
>+
>+        (WebKit::NavigationState::NavigationClient::decidePolicyForPluginLoad):
>+        Remove support for obsolete delegate method.
>+
> 2018-08-23  Commit Queue  <commit-queue@webkit.org>
> 
>         Unreviewed, rolling out r235216.
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h b/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h
>index edaf84061e240cf5bb2f8f889a634e99b4876e2b..3c2efa63ab6726c673e1ac786cdb2e7c04ad4599 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h
>@@ -106,7 +106,6 @@ static const WKNavigationResponsePolicy _WKNavigationResponsePolicyBecomeDownloa
> - (void)_webView:(WKWebView *)webView willGoToBackForwardListItem:(WKBackForwardListItem *)item inPageCache:(BOOL)inPageCache WK_API_AVAILABLE(macosx(10.13.4));
> - (void)_webView:(WKWebView *)webView didFailToInitializePlugInWithInfo:(NSDictionary *)info WK_API_AVAILABLE(macosx(10.13.4));
> - (void)_webView:(WKWebView *)webView didBlockInsecurePluginVersionWithInfo:(NSDictionary *)info WK_API_AVAILABLE(macosx(WK_MAC_TBA));
>-- (_WKPluginModuleLoadPolicy)_webView:(WKWebView *)webView decidePolicyForPluginLoadWithCurrentPolicy:(_WKPluginModuleLoadPolicy)policy pluginInfo:(NSDictionary *)info unavailabilityDescription:(NSString *)unavailabilityDescription WK_API_AVAILABLE(macosx(WK_MAC_TBA));
> - (void)_webView:(WKWebView *)webView decidePolicyForPluginLoadWithCurrentPolicy:(_WKPluginModuleLoadPolicy)policy pluginInfo:(NSDictionary *)info completionHandler:(void (^)(_WKPluginModuleLoadPolicy policy, NSString * unavailabilityDescription))completionHandler WK_API_AVAILABLE(macosx(WK_MAC_TBA));
> - (void)_webView:(WKWebView *)webView backForwardListItemAdded:(WKBackForwardListItem *)itemAdded removed:(NSArray<WKBackForwardListItem *> *)itemsRemoved WK_API_AVAILABLE(macosx(10.13.4));
> #endif
>diff --git a/Source/WebKit/UIProcess/Cocoa/NavigationState.h b/Source/WebKit/UIProcess/Cocoa/NavigationState.h
>index e2a0b8bc69822ec41bb212b22db7a8e7be09ac4a..7538e65e4cf7a028f0c4b5ac28d04f58d715c13c 100644
>--- a/Source/WebKit/UIProcess/Cocoa/NavigationState.h
>+++ b/Source/WebKit/UIProcess/Cocoa/NavigationState.h
>@@ -229,7 +229,6 @@ private:
>         bool webViewDidFailToInitializePlugInWithInfo : 1;
>         bool webViewDidBlockInsecurePluginVersionWithInfo : 1;
>         bool webViewWillGoToBackForwardListItemInPageCache : 1;
>-        bool webViewDecidePolicyForPluginLoadWithCurrentPolicyPluginInfoUnavailabilityDescription : 1;
>         bool webViewDecidePolicyForPluginLoadWithCurrentPolicyPluginInfoCompletionHandler : 1;
> #endif
>     } m_navigationDelegateMethods;
>diff --git a/Source/WebKit/UIProcess/Cocoa/NavigationState.mm b/Source/WebKit/UIProcess/Cocoa/NavigationState.mm
>index 11d1665ae4927dc45b64facfd097842d4a9b3d8d..a1526c811f538b32ea54465e24a01d272bdbc642 100644
>--- a/Source/WebKit/UIProcess/Cocoa/NavigationState.mm
>+++ b/Source/WebKit/UIProcess/Cocoa/NavigationState.mm
>@@ -186,7 +186,6 @@ void NavigationState::setNavigationDelegate(id <WKNavigationDelegate> delegate)
>     m_navigationDelegateMethods.webViewDidFailToInitializePlugInWithInfo = [delegate respondsToSelector:@selector(_webView:didFailToInitializePlugInWithInfo:)];
>     m_navigationDelegateMethods.webViewDidBlockInsecurePluginVersionWithInfo = [delegate respondsToSelector:@selector(_webView:didBlockInsecurePluginVersionWithInfo:)];
>     m_navigationDelegateMethods.webViewBackForwardListItemAddedRemoved = [delegate respondsToSelector:@selector(_webView:backForwardListItemAdded:removed:)];
>-    m_navigationDelegateMethods.webViewDecidePolicyForPluginLoadWithCurrentPolicyPluginInfoUnavailabilityDescription = [delegate respondsToSelector:@selector(_webView:decidePolicyForPluginLoadWithCurrentPolicy:pluginInfo:unavailabilityDescription:)];
>     m_navigationDelegateMethods.webViewDecidePolicyForPluginLoadWithCurrentPolicyPluginInfoCompletionHandler = [delegate respondsToSelector:@selector(_webView:decidePolicyForPluginLoadWithCurrentPolicy:pluginInfo:completionHandler:)];
> #endif
> }
>@@ -362,25 +361,20 @@ static _WKPluginModuleLoadPolicy wkPluginModuleLoadPolicy(WebKit::PluginModuleLo
> 
> void NavigationState::NavigationClient::decidePolicyForPluginLoad(WebKit::WebPageProxy&, WebKit::PluginModuleLoadPolicy currentPluginLoadPolicy, API::Dictionary& pluginInformation, CompletionHandler<void(WebKit::PluginModuleLoadPolicy, const String&)>&& completionHandler)
> {
>-    if (!m_navigationState.m_navigationDelegateMethods.webViewDecidePolicyForPluginLoadWithCurrentPolicyPluginInfoUnavailabilityDescription && !m_navigationState.m_navigationDelegateMethods.webViewDecidePolicyForPluginLoadWithCurrentPolicyPluginInfoCompletionHandler)
>+    if (!m_navigationState.m_navigationDelegateMethods.webViewDecidePolicyForPluginLoadWithCurrentPolicyPluginInfoCompletionHandler)
>         completionHandler(currentPluginLoadPolicy, { });
>     
>     auto navigationDelegate = m_navigationState.m_navigationDelegate.get();
>     if (!navigationDelegate)
>         completionHandler(currentPluginLoadPolicy, { });
> 
>-    if (m_navigationState.m_navigationDelegateMethods.webViewDecidePolicyForPluginLoadWithCurrentPolicyPluginInfoCompletionHandler) {
>-        auto checker = CompletionHandlerCallChecker::create(navigationDelegate.get(), @selector(_webView:decidePolicyForPluginLoadWithCurrentPolicy:pluginInfo:completionHandler:));
>-        [(id <WKNavigationDelegatePrivate>)navigationDelegate _webView:m_navigationState.m_webView decidePolicyForPluginLoadWithCurrentPolicy:wkPluginModuleLoadPolicy(currentPluginLoadPolicy) pluginInfo:wrapper(pluginInformation) completionHandler:BlockPtr<void(_WKPluginModuleLoadPolicy, NSString *)>::fromCallable([completionHandler = WTFMove(completionHandler), checker = WTFMove(checker)](_WKPluginModuleLoadPolicy policy, NSString *unavailabilityDescription) mutable {
>-            if (checker->completionHandlerHasBeenCalled())
>-                return;
>-            checker->didCallCompletionHandler();
>-            completionHandler(pluginModuleLoadPolicy(policy), unavailabilityDescription);
>-        }).get()];
>-        return;
>-    }
>-
>-    completionHandler(pluginModuleLoadPolicy([(id <WKNavigationDelegatePrivate>)navigationDelegate _webView:m_navigationState.m_webView decidePolicyForPluginLoadWithCurrentPolicy:wkPluginModuleLoadPolicy(currentPluginLoadPolicy) pluginInfo:wrapper(pluginInformation) unavailabilityDescription:nil]), { });
>+    auto checker = CompletionHandlerCallChecker::create(navigationDelegate.get(), @selector(_webView:decidePolicyForPluginLoadWithCurrentPolicy:pluginInfo:completionHandler:));
>+    [(id <WKNavigationDelegatePrivate>)navigationDelegate _webView:m_navigationState.m_webView decidePolicyForPluginLoadWithCurrentPolicy:wkPluginModuleLoadPolicy(currentPluginLoadPolicy) pluginInfo:wrapper(pluginInformation) completionHandler:BlockPtr<void(_WKPluginModuleLoadPolicy, NSString *)>::fromCallable([completionHandler = WTFMove(completionHandler), checker = WTFMove(checker)](_WKPluginModuleLoadPolicy policy, NSString *unavailabilityDescription) mutable {
>+        if (checker->completionHandlerHasBeenCalled())
>+            return;
>+        checker->didCallCompletionHandler();
>+        completionHandler(pluginModuleLoadPolicy(policy), unavailabilityDescription);
>+    }).get()];
> }
> 
> inline WebCore::WebGLLoadPolicy toWebCoreWebGLLoadPolicy(_WKWebGLLoadPolicy policy)

Flags:

achristensen: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 188889: 347931