Attachment 346781 Details for Bug 188414 – ROLLOUT of r234314

[patch] ROLLOUT of r234314

bug-188414-20180808150538.patch (text/plain), 14.40 KB, created by WebKit Commit Bot on 2018-08-08 12:05:38 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2018-08-08 12:05:38 PDT

Size: 14.40 KB

patch

obsolete

>Subversion Revision: 234703
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index a8463f581e6dc46dbaeef030ce65bea97cc066d4..d13283f06fb230669fead36b4e8416c2805aae42 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,26 @@
>+2018-08-08  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r234314, r234320, and r234321.
>+        https://bugs.webkit.org/show_bug.cgi?id=188414
>+
>+        Caused email sign in issue (Requested by ryanhaddad on
>+        #webkit).
>+
>+        Reverted changesets:
>+
>+        "Remove unused WKNavigationDelegatePrivate
>+        decidePolicyForNavigationAction SPI"
>+        https://bugs.webkit.org/show_bug.cgi?id=188077
>+        https://trac.webkit.org/changeset/234314
>+
>+        "Fix API tests after r234314"
>+        https://bugs.webkit.org/show_bug.cgi?id=188077
>+        https://trac.webkit.org/changeset/234320
>+
>+        "Fix API tests after r234314"
>+        https://bugs.webkit.org/show_bug.cgi?id=188077
>+        https://trac.webkit.org/changeset/234321
>+
> 2018-08-05  Darin Adler  <darin@apple.com>
> 
>         [Cocoa] More tweaks and refactoring to prepare for ARC
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h b/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h
>index ff1f0547d808f88de21b43989c9d5edc3ab9ae5e..1e2297b06a091eac168ba526c9d3fe57dfd4d99b 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h
>@@ -91,6 +91,7 @@ static const WKNavigationResponsePolicy _WKNavigationResponsePolicyBecomeDownloa
> - (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));
>diff --git a/Source/WebKit/UIProcess/Cocoa/NavigationState.h b/Source/WebKit/UIProcess/Cocoa/NavigationState.h
>index c5b122c94e4094a419939dcfe705f946c2c28141..2bfe65c8beb1130cc5300ab6e252998fe3d1eb03 100644
>--- a/Source/WebKit/UIProcess/Cocoa/NavigationState.h
>+++ b/Source/WebKit/UIProcess/Cocoa/NavigationState.h
>@@ -185,6 +185,7 @@ private:
> 
>     struct {
>         bool webViewDecidePolicyForNavigationActionDecisionHandler : 1;
>+        bool webViewDecidePolicyForNavigationActionDecisionHandlerWebsitePolicies : 1;
>         bool webViewDecidePolicyForNavigationActionUserInfoDecisionHandlerWebsitePolicies : 1;
>         bool webViewDecidePolicyForNavigationResponseDecisionHandler : 1;
> 
>diff --git a/Source/WebKit/UIProcess/Cocoa/NavigationState.mm b/Source/WebKit/UIProcess/Cocoa/NavigationState.mm
>index c54b46e7610e98a4b0bcd0997a0229fbfe37f5b7..6fd0293c30eb69278d717b54d68cdb33c1c2f461 100644
>--- a/Source/WebKit/UIProcess/Cocoa/NavigationState.mm
>+++ b/Source/WebKit/UIProcess/Cocoa/NavigationState.mm
>@@ -142,8 +142,10 @@ void NavigationState::setNavigationDelegate(id <WKNavigationDelegate> delegate)
>     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:)];
>@@ -480,6 +482,7 @@ void NavigationState::NavigationClient::decidePolicyForNavigationAction(WebPageP
>     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) {
>@@ -517,9 +520,9 @@ void NavigationState::NavigationClient::decidePolicyForNavigationAction(WebPageP
>     if (!navigationDelegate)
>         return;
> 
>-    bool delegateHasWebsitePolicies = m_navigationState.m_navigationDelegateMethods.webViewDecidePolicyForNavigationActionUserInfoDecisionHandlerWebsitePolicies;
>+    bool delegateHasWebsitePolicies = m_navigationState.m_navigationDelegateMethods.webViewDecidePolicyForNavigationActionDecisionHandlerWebsitePolicies || m_navigationState.m_navigationDelegateMethods.webViewDecidePolicyForNavigationActionUserInfoDecisionHandlerWebsitePolicies;
>     
>-    auto checker = CompletionHandlerCallChecker::create(navigationDelegate.get(), delegateHasWebsitePolicies ? @selector(_webView:decidePolicyForNavigationAction:userInfo:decisionHandler:) : @selector(webView:decidePolicyForNavigationAction:decisionHandler:));
>+    auto checker = CompletionHandlerCallChecker::create(navigationDelegate.get(), delegateHasWebsitePolicies ? @selector(_webView:decidePolicyForNavigationAction: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())
>@@ -566,7 +569,10 @@ void NavigationState::NavigationClient::decidePolicyForNavigationAction(WebPageP
>     
>     if (delegateHasWebsitePolicies) {
>         auto decisionHandler = BlockPtr<void(WKNavigationActionPolicy, _WKWebsitePolicies *)>::fromCallable(WTFMove(decisionHandlerWithPolicies));
>-        [(id <WKNavigationDelegatePrivate>)navigationDelegate _webView:m_navigationState.m_webView decidePolicyForNavigationAction:wrapper(navigationAction) userInfo:userInfo ? static_cast<id <NSSecureCoding>>(userInfo->wrapper()) : nil decisionHandler:decisionHandler.get()];
>+        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()];
>     } else {
>         auto decisionHandlerWithoutPolicies = [decisionHandlerWithPolicies = WTFMove(decisionHandlerWithPolicies)] (WKNavigationActionPolicy actionPolicy) mutable {
>             decisionHandlerWithPolicies(actionPolicy, nil);
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 5beae2a31bd37f2cfddf518eb8684bae1b306128..8e09b233764bce3580f44159f6f559d2670a8c2d 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,26 @@
>+2018-08-08  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r234314, r234320, and r234321.
>+        https://bugs.webkit.org/show_bug.cgi?id=188414
>+
>+        Caused email sign in issue (Requested by ryanhaddad on
>+        #webkit).
>+
>+        Reverted changesets:
>+
>+        "Remove unused WKNavigationDelegatePrivate
>+        decidePolicyForNavigationAction SPI"
>+        https://bugs.webkit.org/show_bug.cgi?id=188077
>+        https://trac.webkit.org/changeset/234314
>+
>+        "Fix API tests after r234314"
>+        https://bugs.webkit.org/show_bug.cgi?id=188077
>+        https://trac.webkit.org/changeset/234320
>+
>+        "Fix API tests after r234314"
>+        https://bugs.webkit.org/show_bug.cgi?id=188077
>+        https://trac.webkit.org/changeset/234321
>+
> 2018-08-08  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [iOS] fast/events/ios/contenteditable-autocapitalize.html is a flaky failure
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsitePolicies.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsitePolicies.mm
>index 908f4cb8b0cb880f74f30fffe4b1f852b9733449..e99e90fee1b684d62413417d4f78d325254e3142 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsitePolicies.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsitePolicies.mm
>@@ -96,7 +96,7 @@ static size_t alertCount;
>     completionHandler();
> }
> 
>-- (void)_webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction userInfo:(id <NSSecureCoding>)userInfo decisionHandler:(void (^)(WKNavigationActionPolicy, _WKWebsitePolicies *))decisionHandler
>+- (void)_webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy, _WKWebsitePolicies *))decisionHandler
> {
>     _WKWebsitePolicies *websitePolicies = [[[_WKWebsitePolicies alloc] init] autorelease];
>     switch (alertCount) {
>@@ -180,7 +180,7 @@ TEST(WebKit, WebsitePoliciesContentBlockersEnabled)
>     decisionHandler(WKNavigationActionPolicyAllow);
> }
> 
>-- (void)_webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction userInfo:(id <NSSecureCoding>)userInfo decisionHandler:(void (^)(WKNavigationActionPolicy, _WKWebsitePolicies *))decisionHandler
>+- (void)_webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy, _WKWebsitePolicies *))decisionHandler
> {
>     _WKWebsitePolicies *websitePolicies = [[[_WKWebsitePolicies alloc] init] autorelease];
>     if (_allowedAutoplayQuirksForURL)
>@@ -214,7 +214,7 @@ TEST(WebKit, WebsitePoliciesContentBlockersEnabled)
>     decisionHandler(WKNavigationActionPolicyAllow);
> }
> 
>-- (void)_webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction userInfo:(id <NSSecureCoding>)userInfo decisionHandler:(void (^)(WKNavigationActionPolicy, _WKWebsitePolicies *))decisionHandler
>+- (void)_webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy, _WKWebsitePolicies *))decisionHandler
> {
>     dispatch_async(dispatch_get_main_queue(), ^{
>         _WKWebsitePolicies *websitePolicies = [[[_WKWebsitePolicies alloc] init] autorelease];
>@@ -778,7 +778,7 @@ static void respond(id <WKURLSchemeTask>task, NSString *html = nil)
> 
> @implementation CustomHeaderFieldsDelegate
> 
>-- (void)_webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction userInfo:(id <NSSecureCoding>)userInfo decisionHandler:(void (^)(WKNavigationActionPolicy, _WKWebsitePolicies *))decisionHandler
>+- (void)_webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy, _WKWebsitePolicies *))decisionHandler
> {
>     _WKWebsitePolicies *websitePolicies = [[[_WKWebsitePolicies alloc] init] autorelease];
>     [websitePolicies setCustomHeaderFields:@{@"X-key1": @"value1", @"X-key2": @"value2"}];
>@@ -870,7 +870,7 @@ TEST(WebKit, CustomHeaderFields)
>     decisionHandler(WKNavigationActionPolicyAllow);
> }
> 
>-- (void)_webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction userInfo:(id <NSSecureCoding>)userInfo decisionHandler:(void (^)(WKNavigationActionPolicy, _WKWebsitePolicies *))decisionHandler
>+- (void)_webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy, _WKWebsitePolicies *))decisionHandler
> {
>     _WKWebsitePolicies *websitePolicies = [[[_WKWebsitePolicies alloc] init] autorelease];
>     if (_popUpPolicyForURL)
>@@ -919,7 +919,7 @@ static bool done;
> 
> @implementation WebsitePoliciesWebsiteDataStoreDelegate
> 
>-- (void)_webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction userInfo:(id <NSSecureCoding>)userInfo decisionHandler:(void (^)(WKNavigationActionPolicy, _WKWebsitePolicies *))decisionHandler
>+- (void)_webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy, _WKWebsitePolicies *))decisionHandler
> {
>     NSURL *url = navigationAction.request.URL;
>     if ([url.path isEqualToString:@"/invalid"]) {

Actions: View | Formatted Diff | Diff

Attachments on bug 188414: 346781