Attachment 345871 Details for Bug 188077 – Patch

[patch] Patch

bug-188077-20180726141712.patch (text/plain), 8.36 KB, created by Alex Christensen on 2018-07-26 14:17:12 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-07-26 14:17:12 PDT

Size: 8.36 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 234273)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,19 @@
>+2018-07-26  Alex Christensen  <achristensen@webkit.org>
>+
>+        Remove unused WKNavigationDelegatePrivate decidePolicyForNavigationAction SPI
>+        https://bugs.webkit.org/show_bug.cgi?id=188077
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The one client has moved to the version with userInfo, and it never used the SPI
>+        on old operating systems.
>+
>+        * UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h:
>+        * UIProcess/Cocoa/NavigationState.h:
>+        * UIProcess/Cocoa/NavigationState.mm:
>+        (WebKit::NavigationState::setNavigationDelegate):
>+        (WebKit::NavigationState::NavigationClient::decidePolicyForNavigationAction):
>+
> 2018-07-26  Commit Queue  <commit-queue@webkit.org>
> 
>         Unreviewed, rolling out r234181 and r234189.
>Index: Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h	(revision 234209)
>+++ Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h	(working copy)
>@@ -91,7 +91,6 @@ static const WKNavigationResponsePolicy 
> - (void)_webViewWillEndNavigationGesture:(WKWebView *)webView withNavigationToBackForwardListItem:(WKBackForwardListItem *)item;
> - (void)_webView:(WKWebView *)webView willSnapshotBackForwardListItem:(WKBackForwardListItem *)item;
> - (void)_webViewDidRemoveNavigationGestureSnapshot:(WKWebView *)webView WK_API_AVAILABLE(macosx(10.12), ios(10.0));
>-- (void)_webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy, _WKWebsitePolicies *))decisionHandler WK_API_AVAILABLE(macosx(10.12.3), ios(10.3));
> - (void)_webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction userInfo:(id <NSSecureCoding>)userInfo decisionHandler:(void (^)(WKNavigationActionPolicy, _WKWebsitePolicies *))decisionHandler WK_API_AVAILABLE(macosx(10.13.4), ios(11.3));
> - (void)_webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation userInfo:(id <NSSecureCoding>)userInfo WK_API_AVAILABLE(macosx(10.13.4), ios(11.3));
> - (void)_webView:(WKWebView *)webView didFailNavigation:(WKNavigation *)navigation withError:(NSError *)error userInfo:(id <NSSecureCoding>)userInfo WK_API_AVAILABLE(macosx(10.13.4), ios(11.3));
>Index: Source/WebKit/UIProcess/Cocoa/NavigationState.h
>===================================================================
>--- Source/WebKit/UIProcess/Cocoa/NavigationState.h	(revision 234209)
>+++ Source/WebKit/UIProcess/Cocoa/NavigationState.h	(working copy)
>@@ -185,7 +185,6 @@ private:
> 
>     struct {
>         bool webViewDecidePolicyForNavigationActionDecisionHandler : 1;
>-        bool webViewDecidePolicyForNavigationActionDecisionHandlerWebsitePolicies : 1;
>         bool webViewDecidePolicyForNavigationActionUserInfoDecisionHandlerWebsitePolicies : 1;
>         bool webViewDecidePolicyForNavigationResponseDecisionHandler : 1;
> 
>Index: Source/WebKit/UIProcess/Cocoa/NavigationState.mm
>===================================================================
>--- Source/WebKit/UIProcess/Cocoa/NavigationState.mm	(revision 234209)
>+++ Source/WebKit/UIProcess/Cocoa/NavigationState.mm	(working copy)
>@@ -142,10 +142,8 @@ void NavigationState::setNavigationDeleg
>     m_navigationDelegate = delegate;
> 
>     m_navigationDelegateMethods.webViewDecidePolicyForNavigationActionDecisionHandler = [delegate respondsToSelector:@selector(webView:decidePolicyForNavigationAction:decisionHandler:)];
>-    m_navigationDelegateMethods.webViewDecidePolicyForNavigationActionDecisionHandlerWebsitePolicies = [delegate respondsToSelector:@selector(_webView:decidePolicyForNavigationAction:decisionHandler:)];
>     m_navigationDelegateMethods.webViewDecidePolicyForNavigationActionUserInfoDecisionHandlerWebsitePolicies = [delegate respondsToSelector:@selector(_webView:decidePolicyForNavigationAction:userInfo:decisionHandler:)];
>     m_navigationDelegateMethods.webViewDecidePolicyForNavigationResponseDecisionHandler = [delegate respondsToSelector:@selector(webView:decidePolicyForNavigationResponse:decisionHandler:)];
>-
>     m_navigationDelegateMethods.webViewDidStartProvisionalNavigation = [delegate respondsToSelector:@selector(webView:didStartProvisionalNavigation:)];
>     m_navigationDelegateMethods.webViewDidStartProvisionalNavigationUserInfo = [delegate respondsToSelector:@selector(_webView:didStartProvisionalNavigation:userInfo:)];
>     m_navigationDelegateMethods.webViewDidReceiveServerRedirectForProvisionalNavigation = [delegate respondsToSelector:@selector(webView:didReceiveServerRedirectForProvisionalNavigation:)];
>@@ -482,7 +480,6 @@ void NavigationState::NavigationClient::
>     bool subframeNavigation = navigationAction->targetFrame() && !navigationAction->targetFrame()->isMainFrame();
> 
>     if (!m_navigationState.m_navigationDelegateMethods.webViewDecidePolicyForNavigationActionDecisionHandler
>-        && !m_navigationState.m_navigationDelegateMethods.webViewDecidePolicyForNavigationActionDecisionHandlerWebsitePolicies
>         && !m_navigationState.m_navigationDelegateMethods.webViewDecidePolicyForNavigationActionUserInfoDecisionHandlerWebsitePolicies) {
>         auto completionHandler = [webPage = makeRef(webPageProxy), listener = WTFMove(listener), navigationAction = navigationAction.copyRef()] (bool followedLinkToApp) {
>             if (followedLinkToApp) {
>@@ -520,9 +517,9 @@ void NavigationState::NavigationClient::
>     if (!navigationDelegate)
>         return;
> 
>-    bool delegateHasWebsitePolicies = m_navigationState.m_navigationDelegateMethods.webViewDecidePolicyForNavigationActionDecisionHandlerWebsitePolicies || m_navigationState.m_navigationDelegateMethods.webViewDecidePolicyForNavigationActionUserInfoDecisionHandlerWebsitePolicies;
>+    bool delegateHasWebsitePolicies = m_navigationState.m_navigationDelegateMethods.webViewDecidePolicyForNavigationActionUserInfoDecisionHandlerWebsitePolicies;
>     
>-    auto checker = CompletionHandlerCallChecker::create(navigationDelegate.get(), delegateHasWebsitePolicies ? @selector(_webView:decidePolicyForNavigationAction:decisionHandler:) : @selector(webView:decidePolicyForNavigationAction:decisionHandler:));
>+    auto checker = CompletionHandlerCallChecker::create(navigationDelegate.get(), delegateHasWebsitePolicies ? @selector(_webView:decidePolicyForNavigationAction:userInfo:decisionHandler:) : @selector(webView:decidePolicyForNavigationAction:decisionHandler:));
>     
>     auto decisionHandlerWithPolicies = [localListener = WTFMove(listener), navigationAction = navigationAction.copyRef(), checker = WTFMove(checker), mainFrameURLString, webPageProxy = makeRef(webPageProxy), subframeNavigation](WKNavigationActionPolicy actionPolicy, _WKWebsitePolicies *websitePolicies) mutable {
>         if (checker->completionHandlerHasBeenCalled())
>@@ -569,10 +566,7 @@ void NavigationState::NavigationClient::
>     
>     if (delegateHasWebsitePolicies) {
>         auto decisionHandler = BlockPtr<void(WKNavigationActionPolicy, _WKWebsitePolicies *)>::fromCallable(WTFMove(decisionHandlerWithPolicies));
>-        if (m_navigationState.m_navigationDelegateMethods.webViewDecidePolicyForNavigationActionUserInfoDecisionHandlerWebsitePolicies)
>-            [(id <WKNavigationDelegatePrivate>)navigationDelegate _webView:m_navigationState.m_webView decidePolicyForNavigationAction:wrapper(navigationAction) userInfo:userInfo ? static_cast<id <NSSecureCoding>>(userInfo->wrapper()) : nil decisionHandler:decisionHandler.get()];
>-        else
>-            [(id <WKNavigationDelegatePrivate>)navigationDelegate _webView:m_navigationState.m_webView decidePolicyForNavigationAction:wrapper(navigationAction) decisionHandler:decisionHandler.get()];
>+        [(id <WKNavigationDelegatePrivate>)navigationDelegate _webView:m_navigationState.m_webView decidePolicyForNavigationAction:wrapper(navigationAction) userInfo:userInfo ? static_cast<id <NSSecureCoding>>(userInfo->wrapper()) : nil decisionHandler:decisionHandler.get()];
>     } else {
>         auto decisionHandlerWithoutPolicies = [decisionHandlerWithPolicies = WTFMove(decisionHandlerWithPolicies)] (WKNavigationActionPolicy actionPolicy) mutable {
>             decisionHandlerWithPolicies(actionPolicy, nil);

Actions: View | Formatted Diff | Diff

Attachments on bug 188077: 345871