<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[191487] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/191487">191487</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2015-10-22 17:09:20 -0700 (Thu, 22 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Navigations on the same host (but with different schemes and ports) should not trigger universal links
<rdar://problem/22811325>
https://bugs.webkit.org/show_bug.cgi?id=150481
Reviewed by Dan Bernstein.
Source/WebCore:
Add new helper which efficiently compares the hosts of two URLs.
* platform/URL.cpp:
(WebCore::hostsAreEqual):
* platform/URL.h:
Source/WebKit/mac:
* WebCoreSupport/WebFrameLoaderClient.mm:
(shouldTryAppLink):
Update the policy for following universal links to only take host into consideration.
Source/WebKit2:
Update the policy for following universal links to only take host into consideration.
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageUIClient):
* UIProcess/Cocoa/UIDelegate.mm:
(WebKit::UIDelegate::UIClient::createNewPage):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::decidePolicyForNavigationAction):
(WebKit::WebPageProxy::decidePolicyForNewWindowAction):
(WebKit::WebPageProxy::createNewPage):
(WebKit::WebPageProxy::showPage):
Tools:
* TestWebKitAPI/Tests/WebKit2Cocoa/ShouldOpenExternalURLsInNewWindowActions.mm:
Update test to test that navigations on the same host but with different schemes does not
trigger universal links, but that changes in the host do.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformURLcpp">trunk/Source/WebCore/platform/URL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformURLh">trunk/Source/WebCore/platform/URL.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaUIDelegatemm">trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaShouldOpenExternalURLsInNewWindowActionsmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ShouldOpenExternalURLsInNewWindowActions.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191486 => 191487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-22 23:31:53 UTC (rev 191486)
+++ trunk/Source/WebCore/ChangeLog 2015-10-23 00:09:20 UTC (rev 191487)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-10-22 Sam Weinig <sam@webkit.org>
+
+ Navigations on the same host (but with different schemes and ports) should not trigger universal links
+ <rdar://problem/22811325>
+ https://bugs.webkit.org/show_bug.cgi?id=150481
+
+ Reviewed by Dan Bernstein.
+
+ Add new helper which efficiently compares the hosts of two URLs.
+
+ * platform/URL.cpp:
+ (WebCore::hostsAreEqual):
+ * platform/URL.h:
+
</ins><span class="cx"> 2015-10-22 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove unused Timeline GCEvent Record type
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.cpp (191486 => 191487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URL.cpp 2015-10-22 23:31:53 UTC (rev 191486)
+++ trunk/Source/WebCore/platform/URL.cpp 2015-10-23 00:09:20 UTC (rev 191487)
</span><span class="lines">@@ -1597,6 +1597,23 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool hostsAreEqual(const URL& a, const URL& b)
+{
+ int hostStartA = a.hostStart();
+ int hostLengthA = a.hostEnd() - hostStartA;
+ int hostStartB = b.hostStart();
+ int hostLengthB = b.hostEnd() - hostStartB;
+ if (hostLengthA != hostLengthB)
+ return false;
+
+ for (int i = 0; i < hostLengthA; ++i) {
+ if (a.string()[hostStartA + i] != b.string()[hostStartB + i])
+ return false;
+ }
+
+ return true;
+}
+
</ins><span class="cx"> String encodeWithURLEscapeSequences(const String& notEncodedString, PercentEncodeCharacterClass whatToEncode)
</span><span class="cx"> {
</span><span class="cx"> CString asUTF8 = notEncodedString.utf8();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.h (191486 => 191487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URL.h 2015-10-22 23:31:53 UTC (rev 191486)
+++ trunk/Source/WebCore/platform/URL.h 2015-10-23 00:09:20 UTC (rev 191487)
</span><span class="lines">@@ -233,6 +233,7 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool equalIgnoringFragmentIdentifier(const URL&, const URL&);
</span><span class="cx"> WEBCORE_EXPORT bool protocolHostAndPortAreEqual(const URL&, const URL&);
</span><ins>+WEBCORE_EXPORT bool hostsAreEqual(const URL&, const URL&);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT const URL& blankURL();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (191486 => 191487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-10-22 23:31:53 UTC (rev 191486)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-10-23 00:09:20 UTC (rev 191487)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-10-22 Sam Weinig <sam@webkit.org>
+
+ Navigations on the same host (but with different schemes and ports) should not trigger universal links
+ <rdar://problem/22811325>
+ https://bugs.webkit.org/show_bug.cgi?id=150481
+
+ Reviewed by Dan Bernstein.
+
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (shouldTryAppLink):
+ Update the policy for following universal links to only take host into consideration.
+
</ins><span class="cx"> 2015-10-22 Gordon Sheridan <gordon_sheridan@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix build for clang-700.0.59.5 by replacing deprecated calls to convert points between screen and window coordinates for Mac.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (191486 => 191487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2015-10-22 23:31:53 UTC (rev 191486)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2015-10-23 00:09:20 UTC (rev 191487)
</span><span class="lines">@@ -887,7 +887,7 @@
</span><span class="cx"> if (!action.processingUserGesture())
</span><span class="cx"> return NO;
</span><span class="cx">
</span><del>- if (targetFrame && targetFrame->document() && protocolHostAndPortAreEqual(targetFrame->document()->url(), action.url()))
</del><ins>+ if (targetFrame && targetFrame->document() && hostsAreEqual(targetFrame->document()->url(), action.url()))
</ins><span class="cx"> return NO;
</span><span class="cx">
</span><span class="cx"> return YES;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191486 => 191487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-22 23:31:53 UTC (rev 191486)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-23 00:09:20 UTC (rev 191487)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-10-22 Sam Weinig <sam@webkit.org>
+
+ Navigations on the same host (but with different schemes and ports) should not trigger universal links
+ <rdar://problem/22811325>
+ https://bugs.webkit.org/show_bug.cgi?id=150481
+
+ Reviewed by Dan Bernstein.
+
+ Update the policy for following universal links to only take host into consideration.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageUIClient):
+ * UIProcess/Cocoa/UIDelegate.mm:
+ (WebKit::UIDelegate::UIClient::createNewPage):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::decidePolicyForNavigationAction):
+ (WebKit::WebPageProxy::decidePolicyForNewWindowAction):
+ (WebKit::WebPageProxy::createNewPage):
+ (WebKit::WebPageProxy::showPage):
+
</ins><span class="cx"> 2015-10-22 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Simplify menu creation
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (191486 => 191487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-10-22 23:31:53 UTC (rev 191486)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-10-23 00:09:20 UTC (rev 191487)
</span><span class="lines">@@ -1579,7 +1579,7 @@
</span><span class="cx">
</span><span class="cx"> auto sourceFrameInfo = API::FrameInfo::create(*initiatingFrame, securityOriginData.securityOrigin());
</span><span class="cx">
</span><del>- bool shouldOpenAppLinks = !protocolHostAndPortAreEqual(WebCore::URL(WebCore::ParsedURLString, initiatingFrame->url()), resourceRequest.url());
</del><ins>+ bool shouldOpenAppLinks = !hostsAreEqual(WebCore::URL(WebCore::ParsedURLString, initiatingFrame->url()), resourceRequest.url());
</ins><span class="cx"> auto apiNavigationAction = API::NavigationAction::create(navigationActionData, sourceFrameInfo.ptr(), nullptr, resourceRequest, WebCore::URL(), shouldOpenAppLinks);
</span><span class="cx">
</span><span class="cx"> auto apiWindowFeatures = API::WindowFeatures::create(windowFeatures);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaUIDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm (191486 => 191487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2015-10-22 23:31:53 UTC (rev 191486)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2015-10-23 00:09:20 UTC (rev 191487)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx">
</span><span class="cx"> auto sourceFrameInfo = API::FrameInfo::create(*initiatingFrame, securityOriginData.securityOrigin());
</span><span class="cx">
</span><del>- bool shouldOpenAppLinks = !protocolHostAndPortAreEqual(WebCore::URL(WebCore::ParsedURLString, initiatingFrame->url()), request.url());
</del><ins>+ bool shouldOpenAppLinks = !hostsAreEqual(WebCore::URL(WebCore::ParsedURLString, initiatingFrame->url()), request.url());
</ins><span class="cx"> auto apiNavigationAction = API::NavigationAction::create(navigationActionData, sourceFrameInfo.ptr(), nullptr, request, WebCore::URL(), shouldOpenAppLinks);
</span><span class="cx">
</span><span class="cx"> auto apiWindowFeatures = API::WindowFeatures::create(windowFeatures);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (191486 => 191487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-10-22 23:31:53 UTC (rev 191486)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-10-23 00:09:20 UTC (rev 191487)
</span><span class="lines">@@ -3301,7 +3301,7 @@
</span><span class="cx"> else if (originatingFrame)
</span><span class="cx"> sourceFrameInfo = API::FrameInfo::create(*originatingFrame, originatingFrameSecurityOrigin.securityOrigin());
</span><span class="cx">
</span><del>- bool shouldOpenAppLinks = !m_shouldSuppressAppLinksInNextNavigationPolicyDecision && (!destinationFrameInfo || destinationFrameInfo->isMainFrame()) && !protocolHostAndPortAreEqual(URL(ParsedURLString, m_mainFrame->url()), request.url());
</del><ins>+ bool shouldOpenAppLinks = !m_shouldSuppressAppLinksInNextNavigationPolicyDecision && (!destinationFrameInfo || destinationFrameInfo->isMainFrame()) && !hostsAreEqual(URL(ParsedURLString, m_mainFrame->url()), request.url());
</ins><span class="cx">
</span><span class="cx"> auto navigationAction = API::NavigationAction::create(navigationActionData, sourceFrameInfo.get(), destinationFrameInfo.get(), request, originalRequest.url(), shouldOpenAppLinks);
</span><span class="cx">
</span><span class="lines">@@ -3335,7 +3335,7 @@
</span><span class="cx"> if (frame)
</span><span class="cx"> sourceFrameInfo = API::FrameInfo::create(*frame, frameSecurityOrigin.securityOrigin());
</span><span class="cx">
</span><del>- bool shouldOpenAppLinks = !protocolHostAndPortAreEqual(URL(ParsedURLString, m_mainFrame->url()), request.url());
</del><ins>+ bool shouldOpenAppLinks = !hostsAreEqual(URL(ParsedURLString, m_mainFrame->url()), request.url());
</ins><span class="cx"> auto navigationAction = API::NavigationAction::create(navigationActionData, sourceFrameInfo.get(), nullptr, request, request.url(), shouldOpenAppLinks);
</span><span class="cx">
</span><span class="cx"> m_navigationClient->decidePolicyForNavigationAction(*this, navigationAction.get(), WTF::move(listener), m_process->transformHandlesToObjects(userData.object()).get());
</span><span class="lines">@@ -3506,7 +3506,7 @@
</span><span class="cx"> newPageParameters = newPage->creationParameters();
</span><span class="cx">
</span><span class="cx"> WebsiteDataStore::cloneSessionData(*this, *newPage);
</span><del>- newPage->m_shouldSuppressAppLinksInNextNavigationPolicyDecision = protocolHostAndPortAreEqual(URL(ParsedURLString, mainFrameURL), request.url());
</del><ins>+ newPage->m_shouldSuppressAppLinksInNextNavigationPolicyDecision = hostsAreEqual(URL(ParsedURLString, mainFrameURL), request.url());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::showPage()
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (191486 => 191487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-10-22 23:31:53 UTC (rev 191486)
+++ trunk/Tools/ChangeLog 2015-10-23 00:09:20 UTC (rev 191487)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-10-22 Sam Weinig <sam@webkit.org>
+
+ Navigations on the same host (but with different schemes and ports) should not trigger universal links
+ <rdar://problem/22811325>
+ https://bugs.webkit.org/show_bug.cgi?id=150481
+
+ Reviewed by Dan Bernstein.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/ShouldOpenExternalURLsInNewWindowActions.mm:
+ Update test to test that navigations on the same host but with different schemes does not
+ trigger universal links, but that changes in the host do.
+
</ins><span class="cx"> 2015-10-22 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r181972): Scroll position changes to top of youtube page when switching tabs
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaShouldOpenExternalURLsInNewWindowActionsmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ShouldOpenExternalURLsInNewWindowActions.mm (191486 => 191487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ShouldOpenExternalURLsInNewWindowActions.mm 2015-10-22 23:31:53 UTC (rev 191486)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ShouldOpenExternalURLsInNewWindowActions.mm 2015-10-23 00:09:20 UTC (rev 191487)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> [webView setNavigationDelegate:controller.get()];
</span><span class="cx"> [webView setUIDelegate:controller.get()];
</span><span class="cx">
</span><del>- [webView loadHTMLString:@"<body onclick=\"window.open('http://webkit.org/destination')\">" baseURL:[NSURL URLWithString:@"http://webkit.org"]];
</del><ins>+ [webView loadHTMLString:@"<body onclick=\"window.open('https://webkit.org/destination')\">" baseURL:[NSURL URLWithString:@"http://webkit.org"]];
</ins><span class="cx"> TestWebKitAPI::Util::run(&finishedNavigation);
</span><span class="cx"> finishedNavigation = false;
</span><span class="cx">
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> TestWebKitAPI::Util::run(&createdWebView);
</span><span class="cx"> createdWebView = false;
</span><span class="cx">
</span><del>- // User-initiated window.open to the same scheme, host and port should allow external schemes but not App Links.
</del><ins>+ // User-initiated window.open to the same host should allow external schemes but not App Links.
</ins><span class="cx"> ASSERT_TRUE([action _shouldOpenExternalSchemes]);
</span><span class="cx"> ASSERT_FALSE([action _shouldOpenAppLinks]);
</span><span class="cx">
</span><span class="lines">@@ -100,11 +100,11 @@
</span><span class="cx"> TestWebKitAPI::Util::run(&decidedPolicy);
</span><span class="cx"> decidedPolicy = false;
</span><span class="cx">
</span><del>- // User-initiated window.open to the same scheme, host and port should allow external schemes but not App Links.
</del><ins>+ // User-initiated window.open to the same host should allow external schemes but not App Links.
</ins><span class="cx"> ASSERT_TRUE([action _shouldOpenExternalSchemes]);
</span><span class="cx"> ASSERT_FALSE([action _shouldOpenAppLinks]);
</span><span class="cx">
</span><del>- [webView loadHTMLString:@"<body onclick=\"window.open('https://webkit.org/destination')\">" baseURL:[NSURL URLWithString:@"http://webkit.org"]];
</del><ins>+ [webView loadHTMLString:@"<body onclick=\"window.open('http://apple.com/destination')\">" baseURL:[NSURL URLWithString:@"http://webkit.org"]];
</ins><span class="cx"> TestWebKitAPI::Util::run(&finishedNavigation);
</span><span class="cx"> finishedNavigation = false;
</span><span class="cx">
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> TestWebKitAPI::Util::run(&createdWebView);
</span><span class="cx"> createdWebView = false;
</span><span class="cx">
</span><del>- // User-initiated window.open to different scheme, host or port should allow external schemes and App Links.
</del><ins>+ // User-initiated window.open to different host should allow external schemes and App Links.
</ins><span class="cx"> ASSERT_TRUE([action _shouldOpenExternalSchemes]);
</span><span class="cx"> ASSERT_TRUE([action _shouldOpenAppLinks]);
</span><span class="cx">
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> TestWebKitAPI::Util::run(&decidedPolicy);
</span><span class="cx"> decidedPolicy = false;
</span><span class="cx">
</span><del>- // User-initiated window.open to different scheme, host or port should allow external schemes and App Links.
</del><ins>+ // User-initiated window.open to different host should allow external schemes and App Links.
</ins><span class="cx"> ASSERT_TRUE([action _shouldOpenExternalSchemes]);
</span><span class="cx"> ASSERT_TRUE([action _shouldOpenAppLinks]);
</span><span class="cx">
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> [webView setNavigationDelegate:controller.get()];
</span><span class="cx"> [webView setUIDelegate:controller.get()];
</span><span class="cx">
</span><del>- [webView loadHTMLString:@"<a style=\"display: block; height: 100%\" href=\"destination.html\" target=\"_blank\">" baseURL:[NSURL URLWithString:@"http://webkit.org"]];
</del><ins>+ [webView loadHTMLString:@"<a style=\"display: block; height: 100%\" href=\"https://webkit.org/destination.html\" target=\"_blank\">" baseURL:[NSURL URLWithString:@"http://webkit.org"]];
</ins><span class="cx"> TestWebKitAPI::Util::run(&finishedNavigation);
</span><span class="cx"> finishedNavigation = false;
</span><span class="cx">
</span><span class="lines">@@ -153,14 +153,14 @@
</span><span class="cx"> TestWebKitAPI::Util::run(&decidedPolicy);
</span><span class="cx"> decidedPolicy = false;
</span><span class="cx">
</span><del>- // User-initiated targeted navigation to the same scheme, host and port should allow external schemes but not App Links.
</del><ins>+ // User-initiated targeted navigation to the same host should allow external schemes but not App Links.
</ins><span class="cx"> ASSERT_TRUE([action _shouldOpenExternalSchemes]);
</span><span class="cx"> ASSERT_FALSE([action _shouldOpenAppLinks]);
</span><span class="cx">
</span><span class="cx"> TestWebKitAPI::Util::run(&createdWebView);
</span><span class="cx"> createdWebView = false;
</span><span class="cx">
</span><del>- // User-initiated targeted navigation to the same scheme, host and port should allow external schemes but not App Links.
</del><ins>+ // User-initiated targeted navigation to the same host should allow external schemes but not App Links.
</ins><span class="cx"> ASSERT_TRUE([action _shouldOpenExternalSchemes]);
</span><span class="cx"> ASSERT_FALSE([action _shouldOpenAppLinks]);
</span><span class="cx">
</span><span class="lines">@@ -169,11 +169,11 @@
</span><span class="cx"> TestWebKitAPI::Util::run(&decidedPolicy);
</span><span class="cx"> decidedPolicy = false;
</span><span class="cx">
</span><del>- // User-initiated targeted navigation to the same scheme, host and port should allow external schemes but not App Links.
</del><ins>+ // User-initiated targeted navigation to the same host should allow external schemes but not App Links.
</ins><span class="cx"> ASSERT_TRUE([action _shouldOpenExternalSchemes]);
</span><span class="cx"> ASSERT_FALSE([action _shouldOpenAppLinks]);
</span><span class="cx">
</span><del>- [webView loadHTMLString:@"<a style=\"display: block; height: 100%\" href=\"https://webkit.org/destination.html\" target=\"_blank\">" baseURL:[NSURL URLWithString:@"http://webkit.org"]];
</del><ins>+ [webView loadHTMLString:@"<a style=\"display: block; height: 100%\" href=\"http://apple.com/destination.html\" target=\"_blank\">" baseURL:[NSURL URLWithString:@"http://webkit.org"]];
</ins><span class="cx"> TestWebKitAPI::Util::run(&finishedNavigation);
</span><span class="cx"> finishedNavigation = false;
</span><span class="cx">
</span><span class="lines">@@ -183,14 +183,14 @@
</span><span class="cx"> TestWebKitAPI::Util::run(&decidedPolicy);
</span><span class="cx"> decidedPolicy = false;
</span><span class="cx">
</span><del>- // User-initiated targeted navigation to different scheme, host or port should allow external schemes and App Links.
</del><ins>+ // User-initiated targeted navigation to different host should allow external schemes and App Links.
</ins><span class="cx"> ASSERT_TRUE([action _shouldOpenExternalSchemes]);
</span><span class="cx"> ASSERT_TRUE([action _shouldOpenAppLinks]);
</span><span class="cx">
</span><span class="cx"> TestWebKitAPI::Util::run(&createdWebView);
</span><span class="cx"> createdWebView = false;
</span><span class="cx">
</span><del>- // User-initiated targeted navigation to different scheme, host or port should allow external schemes and App Links.
</del><ins>+ // User-initiated targeted navigation to different host should allow external schemes and App Links.
</ins><span class="cx"> ASSERT_TRUE([action _shouldOpenExternalSchemes]);
</span><span class="cx"> ASSERT_TRUE([action _shouldOpenAppLinks]);
</span><span class="cx">
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> TestWebKitAPI::Util::run(&decidedPolicy);
</span><span class="cx"> decidedPolicy = false;
</span><span class="cx">
</span><del>- // User-initiated targeted navigation to different scheme, host or port should allow external schemes and App Links.
</del><ins>+ // User-initiated targeted navigation to different host should allow external schemes and App Links.
</ins><span class="cx"> ASSERT_TRUE([action _shouldOpenExternalSchemes]);
</span><span class="cx"> ASSERT_TRUE([action _shouldOpenAppLinks]);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>