WebKit always goes through LaunchServices for main frame navigation actions

Dan Bernstein · Dan Bernstein · commit 5c0e8e950ef2 · 2015-05-05T00:37:06.000Z
https://bugs.webkit.org/show_bug.cgi?id=144608 Reviewed by Tim Horton. * UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h: Defined _WKNavigationActionPolicyAllowWithoutTryingAppLink. * UIProcess/Cocoa/NavigationState.mm: (WebKit::NavigationState::NavigationClient::decidePolicyForNavigationAction): If the policy is _WKNavigationActionPolicyAllowWithoutTryingAppLink, don’t go through tryAppLink. Canonical link: https://commits.webkit.org/162619@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@183784 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2015-05-04  Dan Bernstein  <mitz@apple.com>
+
+        WebKit always goes through LaunchServices for main frame navigation actions
+        https://bugs.webkit.org/show_bug.cgi?id=144608
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h: Defined
+        _WKNavigationActionPolicyAllowWithoutTryingAppLink.
+        * UIProcess/Cocoa/NavigationState.mm:
+        (WebKit::NavigationState::NavigationClient::decidePolicyForNavigationAction): If the policy
+        is _WKNavigationActionPolicyAllowWithoutTryingAppLink, don’t go through tryAppLink.
+
 2015-05-04  Enrica Casucci  <enrica@apple.com>
 
         [iOS WK2] editorState should include information about selection clipping rectangle.
diff --git a/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h b/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h
@@ -32,6 +32,7 @@
 #if WK_API_ENABLED
 
 static const WKNavigationActionPolicy _WKNavigationActionPolicyDownload = (WKNavigationActionPolicy)(WKNavigationActionPolicyAllow + 1);
+static const WKNavigationActionPolicy WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA) _WKNavigationActionPolicyAllowWithoutTryingAppLink = (WKNavigationActionPolicy)(WKNavigationActionPolicyAllow + 2);
 
 static const WKNavigationResponsePolicy _WKNavigationResponsePolicyBecomeDownload = (WKNavigationResponsePolicy)(WKNavigationResponsePolicyAllow + 1);
 
diff --git a/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm b/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm
@@ -317,6 +317,12 @@ static void tryAppLink(RefPtr<API::NavigationAction> navigationAction, std::func
 #pragma clang diagnostic pop
             localListener->download();
             break;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wswitch"
+        case _WKNavigationActionPolicyAllowWithoutTryingAppLink:
+#pragma clang diagnostic pop
+            localListener->use();
+            break;
         }
     }];
 }

Original file line number	Diff line number	Diff line change
`@@ -317,6 +317,12 @@ static void tryAppLink(RefPtr<API::NavigationAction> navigationAction, std::func`
`317`	`317`	`#pragma clang diagnostic pop`
`318`	`318`	`localListener->download();`
`319`	`319`	`break;`
	`320`	`+#pragma clang diagnostic push`
	`321`	`+#pragma clang diagnostic ignored "-Wswitch"`
	`322`	`+ case _WKNavigationActionPolicyAllowWithoutTryingAppLink:`
	`323`	`+#pragma clang diagnostic pop`
	`324`	`+ localListener->use();`
	`325`	`+ break;`
`320`	`326`	`}`
`321`	`327`	`}];`
`322`	`328`	`}`