<!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>[172697] 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/172697">172697</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2014-08-17 21:37:53 -0700 (Sun, 17 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/167856">r167856</a>): adobe.com no longer able to launch Create Cloud app using a URL with a custom scheme
https://bugs.webkit.org/show_bug.cgi?id=136010
Reviewed by Darin Adler.
Source/WebCore:
<a href="http://trac.webkit.org/projects/webkit/changeset/167856">r167856</a> caused WebKit to stop scheduling certain kinds of navigations (window.location changes, meta-refresh,
and some calls to window.open) when the request URL is invalid. Adobe.com performs one of these navigations to
an invalid URL with an external scheme (aam:), relying on Safari's navigation policy delegate to ignore the
navigation and launch the external app registered to handle aam: URLs. Since the navigation is no longer
scheduled, the policy delegate is never executed and the external app never launches.
Instead of not scheduling the navigation, allow it to proceed until the client's policy delegate has executed
and made a decision. Only disallow the navigation if the policy delegate told WebKit to proceed with the load.
This exposes these navigations to clients via the policy delegate and via willPerformClientRedirectToURL and
didCancelClientRedirectForFrame on the frame load delegate.
Note that <a href="http://trac.webkit.org/projects/webkit/changeset/167856">r167856</a> also caused an iOS regression, and this was resolved in <a href="http://trac.webkit.org/projects/webkit/changeset/170120">r170120</a> by adding a linked-on-or-after
check and a WebCore setting. Since the iOS regression is also resolved by the approach described above, this
patch reverts <a href="http://trac.webkit.org/projects/webkit/changeset/170120">r170120</a> (but keeps some of its tests).
Tests: fast/loader/redirect-to-invalid-url-using-javascript-calls-policy-delegate.html
fast/loader/redirect-to-invalid-url-using-javascript-disallowed.html
fast/loader/redirect-to-invalid-url-using-meta-refresh-calls-policy-delegate.html
fast/loader/redirect-to-invalid-url-using-meta-refresh-disallowed.html
fast/loader/window-open-to-invalid-url-calls-policy-delegate.html
fast/loader/window-open-to-invalid-url-disallowed.html
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::continueLoadAfterNavigationPolicy): Do not continue if the navigation will be a redirect
to an invalid URL.
* loader/NavigationScheduler.cpp:
(WebCore::NavigationScheduler::shouldScheduleNavigation): Resumed scheduling navigations to invalid URLs.
* page/Settings.in: Removed the allowNavigationToInvalidURL setting.
Source/WebKit/mac:
Reverted the linked-on-or-after check added in <a href="http://trac.webkit.org/projects/webkit/changeset/170120">r170120</a> since it is no longer necessary.
* Misc/WebKitVersionChecks.h:
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):
LayoutTests:
Removed tests that verified the behavior of setAllowNavigationToInvalidURL(true), which no longer exists:
* fast/loader/allow-redirect-to-invalid-url-using-javascript-expected.txt: Removed.
* fast/loader/allow-redirect-to-invalid-url-using-javascript.html: Removed.
* fast/loader/allow-redirect-to-invalid-url-using-meta-refresh-expected.txt: Removed.
* fast/loader/allow-redirect-to-invalid-url-using-meta-refresh.html: Removed.
Added tests that verify the policy delegate is executed on some navigations to invalid URLs:
* fast/loader/redirect-to-invalid-url-using-javascript-calls-policy-delegate-expected.txt: Added.
* fast/loader/redirect-to-invalid-url-using-javascript-calls-policy-delegate.html: Added.
* fast/loader/redirect-to-invalid-url-using-meta-refresh-calls-policy-delegate-expected.txt: Added.
* fast/loader/redirect-to-invalid-url-using-meta-refresh-calls-policy-delegate.html: Added.
* fast/loader/window-open-to-invalid-url-calls-policy-delegate-expected.txt: Added.
* fast/loader/window-open-to-invalid-url-calls-policy-delegate.html: Added.
Renamed some existing tests added in <a href="http://trac.webkit.org/projects/webkit/changeset/170120">r170120</a>, modified them to log willPerformClientRedirectToURL and
didCancelClientRedirectForFrame, and added a test to verify navigations in existing frames via window.open:
* fast/loader/redirect-to-invalid-url-using-javascript-disallowed-expected.txt: Renamed from fast/loader/disallow-redirect-to-invalid-url-using-javascript-expected.txt.
* fast/loader/redirect-to-invalid-url-using-javascript-disallowed.html: Renamed from fast/loader/disallow-redirect-to-invalid-url-using-javascript.html.
* fast/loader/redirect-to-invalid-url-using-meta-refresh-disallowed-expected.txt: Renamed from fast/loader/disallow-redirect-to-invalid-url-using-meta-refresh-expected.txt.
* fast/loader/redirect-to-invalid-url-using-meta-refresh-disallowed.html: Renamed from fast/loader/disallow-redirect-to-invalid-url-using-meta-refresh.html.
* fast/loader/window-open-to-invalid-url-disallowed-expected.txt: Added.
* fast/loader/window-open-to-invalid-url-disallowed.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderNavigationSchedulercpp">trunk/Source/WebCore/loader/NavigationScheduler.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingsin">trunk/Source/WebCore/page/Settings.in</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebKitVersionChecksh">trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastloaderredirecttoinvalidurlusingjavascriptcallspolicydelegateexpectedtxt">trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-javascript-calls-policy-delegate-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastloaderredirecttoinvalidurlusingjavascriptcallspolicydelegatehtml">trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-javascript-calls-policy-delegate.html</a></li>
<li><a href="#trunkLayoutTestsfastloaderredirecttoinvalidurlusingjavascriptdisallowedexpectedtxt">trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-javascript-disallowed-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastloaderredirecttoinvalidurlusingjavascriptdisallowedhtml">trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-javascript-disallowed.html</a></li>
<li><a href="#trunkLayoutTestsfastloaderredirecttoinvalidurlusingmetarefreshcallspolicydelegateexpectedtxt">trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-meta-refresh-calls-policy-delegate-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastloaderredirecttoinvalidurlusingmetarefreshcallspolicydelegatehtml">trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-meta-refresh-calls-policy-delegate.html</a></li>
<li><a href="#trunkLayoutTestsfastloaderredirecttoinvalidurlusingmetarefreshdisallowedexpectedtxt">trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-meta-refresh-disallowed-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastloaderredirecttoinvalidurlusingmetarefreshdisallowedhtml">trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-meta-refresh-disallowed.html</a></li>
<li><a href="#trunkLayoutTestsfastloaderwindowopentoinvalidurlcallspolicydelegateexpectedtxt">trunk/LayoutTests/fast/loader/window-open-to-invalid-url-calls-policy-delegate-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastloaderwindowopentoinvalidurlcallspolicydelegatehtml">trunk/LayoutTests/fast/loader/window-open-to-invalid-url-calls-policy-delegate.html</a></li>
<li><a href="#trunkLayoutTestsfastloaderwindowopentoinvalidurldisallowedexpectedtxt">trunk/LayoutTests/fast/loader/window-open-to-invalid-url-disallowed-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastloaderwindowopentoinvalidurldisallowedhtml">trunk/LayoutTests/fast/loader/window-open-to-invalid-url-disallowed.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastloaderallowredirecttoinvalidurlusingjavascriptexpectedtxt">trunk/LayoutTests/fast/loader/allow-redirect-to-invalid-url-using-javascript-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastloaderallowredirecttoinvalidurlusingjavascripthtml">trunk/LayoutTests/fast/loader/allow-redirect-to-invalid-url-using-javascript.html</a></li>
<li><a href="#trunkLayoutTestsfastloaderallowredirecttoinvalidurlusingmetarefreshexpectedtxt">trunk/LayoutTests/fast/loader/allow-redirect-to-invalid-url-using-meta-refresh-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastloaderallowredirecttoinvalidurlusingmetarefreshhtml">trunk/LayoutTests/fast/loader/allow-redirect-to-invalid-url-using-meta-refresh.html</a></li>
<li><a href="#trunkLayoutTestsfastloaderdisallowredirecttoinvalidurlusingjavascriptexpectedtxt">trunk/LayoutTests/fast/loader/disallow-redirect-to-invalid-url-using-javascript-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastloaderdisallowredirecttoinvalidurlusingjavascripthtml">trunk/LayoutTests/fast/loader/disallow-redirect-to-invalid-url-using-javascript.html</a></li>
<li><a href="#trunkLayoutTestsfastloaderdisallowredirecttoinvalidurlusingmetarefreshexpectedtxt">trunk/LayoutTests/fast/loader/disallow-redirect-to-invalid-url-using-meta-refresh-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastloaderdisallowredirecttoinvalidurlusingmetarefreshhtml">trunk/LayoutTests/fast/loader/disallow-redirect-to-invalid-url-using-meta-refresh.html</a></li>
<li><a href="#trunkLayoutTestsfastloaderresourcesredirecttoinvalidurlusingjavascripthtml">trunk/LayoutTests/fast/loader/resources/redirect-to-invalid-url-using-javascript.html</a></li>
<li><a href="#trunkLayoutTestsfastloaderresourcesredirecttoinvalidurlusingmetarefreshhtml">trunk/LayoutTests/fast/loader/resources/redirect-to-invalid-url-using-meta-refresh.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (172696 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-08-17 19:54:40 UTC (rev 172696)
+++ trunk/LayoutTests/ChangeLog 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-08-15 Andy Estes <aestes@apple.com>
+
+ REGRESSION (r167856): adobe.com no longer able to launch Create Cloud app using a URL with a custom scheme
+ https://bugs.webkit.org/show_bug.cgi?id=136010
+
+ Reviewed by Darin Adler.
+
+ Removed tests that verified the behavior of setAllowNavigationToInvalidURL(true), which no longer exists:
+ * fast/loader/allow-redirect-to-invalid-url-using-javascript-expected.txt: Removed.
+ * fast/loader/allow-redirect-to-invalid-url-using-javascript.html: Removed.
+ * fast/loader/allow-redirect-to-invalid-url-using-meta-refresh-expected.txt: Removed.
+ * fast/loader/allow-redirect-to-invalid-url-using-meta-refresh.html: Removed.
+
+ Added tests that verify the policy delegate is executed on some navigations to invalid URLs:
+ * fast/loader/redirect-to-invalid-url-using-javascript-calls-policy-delegate-expected.txt: Added.
+ * fast/loader/redirect-to-invalid-url-using-javascript-calls-policy-delegate.html: Added.
+ * fast/loader/redirect-to-invalid-url-using-meta-refresh-calls-policy-delegate-expected.txt: Added.
+ * fast/loader/redirect-to-invalid-url-using-meta-refresh-calls-policy-delegate.html: Added.
+ * fast/loader/window-open-to-invalid-url-calls-policy-delegate-expected.txt: Added.
+ * fast/loader/window-open-to-invalid-url-calls-policy-delegate.html: Added.
+
+ Renamed some existing tests added in r170120, modified them to log willPerformClientRedirectToURL and
+ didCancelClientRedirectForFrame, and added a test to verify navigations in existing frames via window.open:
+ * fast/loader/redirect-to-invalid-url-using-javascript-disallowed-expected.txt: Renamed from fast/loader/disallow-redirect-to-invalid-url-using-javascript-expected.txt.
+ * fast/loader/redirect-to-invalid-url-using-javascript-disallowed.html: Renamed from fast/loader/disallow-redirect-to-invalid-url-using-javascript.html.
+ * fast/loader/redirect-to-invalid-url-using-meta-refresh-disallowed-expected.txt: Renamed from fast/loader/disallow-redirect-to-invalid-url-using-meta-refresh-expected.txt.
+ * fast/loader/redirect-to-invalid-url-using-meta-refresh-disallowed.html: Renamed from fast/loader/disallow-redirect-to-invalid-url-using-meta-refresh.html.
+ * fast/loader/window-open-to-invalid-url-disallowed-expected.txt: Added.
+ * fast/loader/window-open-to-invalid-url-disallowed.html: Added.
+
</ins><span class="cx"> 2014-08-15 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: Parts of the route/route options windows are invisible at maps.google.com
</span></span></pre></div>
<a id="trunkLayoutTestsfastloaderallowredirecttoinvalidurlusingjavascriptexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/loader/allow-redirect-to-invalid-url-using-javascript-expected.txt (172696 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/allow-redirect-to-invalid-url-using-javascript-expected.txt 2014-08-17 19:54:40 UTC (rev 172696)
+++ trunk/LayoutTests/fast/loader/allow-redirect-to-invalid-url-using-javascript-expected.txt 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-frame "frame" - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-frame "frame" - didCommitLoadForFrame
-frame "frame" - willPerformClientRedirectToURL: x-dummy://A=a&B=b
-frame "frame" - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "frame" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-Tests that we allow redirection to an invalid URL initiated by JavaScript when setting allowNavigationToInvalidURL is true. This test PASSED if you see an entry in the dumped frame load callbacks of the form: "willPerformClientRedirectToURL: x-dummy://A=a&B=b".
-
-Note, this test must be run in DumpRenderTree.
-
-
</del></span></pre></div>
<a id="trunkLayoutTestsfastloaderallowredirecttoinvalidurlusingjavascripthtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/loader/allow-redirect-to-invalid-url-using-javascript.html (172696 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/allow-redirect-to-invalid-url-using-javascript.html 2014-08-17 19:54:40 UTC (rev 172696)
+++ trunk/LayoutTests/fast/loader/allow-redirect-to-invalid-url-using-javascript.html 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.dumpFrameLoadCallbacks();
- testRunner.waitUntilDone();
-}
-
-if (window.internals)
- window.internals.settings.setAllowNavigationToInvalidURL(true);
-</script>
-</head>
-<body>
-<p>Tests that we allow redirection to an invalid URL initiated by JavaScript when setting allowNavigationToInvalidURL is true. This test PASSED if you see an entry in the dumped frame load callbacks of the form: &quot;willPerformClientRedirectToURL: x-dummy://A=a&amp;B=b&quot;.</p>
-<p>Note, this test must be run in DumpRenderTree.</p>
-<iframe id="frame" src="resources/redirect-to-invalid-url-using-javascript.html"></iframe>
-<script>
-function done()
-{
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-window.setTimeout(done, 0);
-</script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastloaderallowredirecttoinvalidurlusingmetarefreshexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/loader/allow-redirect-to-invalid-url-using-meta-refresh-expected.txt (172696 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/allow-redirect-to-invalid-url-using-meta-refresh-expected.txt 2014-08-17 19:54:40 UTC (rev 172696)
+++ trunk/LayoutTests/fast/loader/allow-redirect-to-invalid-url-using-meta-refresh-expected.txt 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -1,14 +0,0 @@
</span><del>-frame "frame" - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-frame "frame" - didCommitLoadForFrame
-frame "frame" - didFinishDocumentLoadForFrame
-frame "frame" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "frame" - willPerformClientRedirectToURL: x-dummy://A=a&B=b
-frame "frame" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-Tests that we allow redirection to an invalid URL initiated by <meta http-equiv="refresh"> when setting allowNavigationToInvalidURL is true. This test PASSED if you see an entry in the dumped frame load callbacks of the form: "willPerformClientRedirectToURL: x-dummy://A=a&B=b".
-
-Note, this test must be run in DumpRenderTree.
-
-
</del></span></pre></div>
<a id="trunkLayoutTestsfastloaderallowredirecttoinvalidurlusingmetarefreshhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/loader/allow-redirect-to-invalid-url-using-meta-refresh.html (172696 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/allow-redirect-to-invalid-url-using-meta-refresh.html 2014-08-17 19:54:40 UTC (rev 172696)
+++ trunk/LayoutTests/fast/loader/allow-redirect-to-invalid-url-using-meta-refresh.html 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.dumpFrameLoadCallbacks();
- testRunner.waitUntilDone();
-}
-
-if (window.internals)
- window.internals.settings.setAllowNavigationToInvalidURL(true);
-</script>
-</head>
-<body>
-<p>Tests that we allow redirection to an invalid URL initiated by &lt;meta http-equiv=&quot;refresh&quot;&gt; when setting allowNavigationToInvalidURL is true. This test PASSED if you see an entry in the dumped frame load callbacks of the form: &quot;willPerformClientRedirectToURL: x-dummy://A=a&amp;B=b&quot;.</p>
-<p>Note, this test must be run in DumpRenderTree.</p>
-<iframe id="frame" src="resources/redirect-to-invalid-url-using-meta-refresh.html"></iframe>
-<script>
-function done()
-{
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-window.setTimeout(done, 0);
-</script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastloaderdisallowredirecttoinvalidurlusingjavascriptexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/loader/disallow-redirect-to-invalid-url-using-javascript-expected.txt (172696 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/disallow-redirect-to-invalid-url-using-javascript-expected.txt 2014-08-17 19:54:40 UTC (rev 172696)
+++ trunk/LayoutTests/fast/loader/disallow-redirect-to-invalid-url-using-javascript-expected.txt 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-frame "frame" - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-frame "frame" - didCommitLoadForFrame
-frame "frame" - didFinishDocumentLoadForFrame
-frame "frame" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "frame" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-Tests that we do not redirect to an invalid URL initiated by JavaScript when setting allowNavigationToInvalidURL is false. This test PASSED if you do not see an entry in the dumped frame load callbacks of the form: "willPerformClientRedirectToURL: x-dummy://A=a&B=b".
-
-Note, this test must be run in DumpRenderTree.
-
-
</del></span></pre></div>
<a id="trunkLayoutTestsfastloaderdisallowredirecttoinvalidurlusingjavascripthtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/loader/disallow-redirect-to-invalid-url-using-javascript.html (172696 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/disallow-redirect-to-invalid-url-using-javascript.html 2014-08-17 19:54:40 UTC (rev 172696)
+++ trunk/LayoutTests/fast/loader/disallow-redirect-to-invalid-url-using-javascript.html 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.dumpFrameLoadCallbacks();
- testRunner.waitUntilDone();
-}
-
-if (window.internals)
- window.internals.settings.setAllowNavigationToInvalidURL(false);
-</script>
-</head>
-<body>
-<p>Tests that we do not redirect to an invalid URL initiated by JavaScript when setting allowNavigationToInvalidURL is false. This test PASSED if you do not see an entry in the dumped frame load callbacks of the form: &quot;willPerformClientRedirectToURL: x-dummy://A=a&amp;B=b&quot;.</p>
-<p>Note, this test must be run in DumpRenderTree.</p>
-<iframe id="frame" src="resources/redirect-to-invalid-url-using-javascript.html"></iframe>
-<script>
-function done()
-{
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-window.setTimeout(done, 0);
-</script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastloaderdisallowredirecttoinvalidurlusingmetarefreshexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/loader/disallow-redirect-to-invalid-url-using-meta-refresh-expected.txt (172696 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/disallow-redirect-to-invalid-url-using-meta-refresh-expected.txt 2014-08-17 19:54:40 UTC (rev 172696)
+++ trunk/LayoutTests/fast/loader/disallow-redirect-to-invalid-url-using-meta-refresh-expected.txt 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-frame "frame" - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-frame "frame" - didCommitLoadForFrame
-frame "frame" - didFinishDocumentLoadForFrame
-frame "frame" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "frame" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-Tests that we do not redirect to an invalid URL initiated by <meta http-equiv="refresh"> when setting allowNavigationToInvalidURL is false. This test PASSED if you do not see an entry in the dumped frame load callbacks of the form: "willPerformClientRedirectToURL: x-dummy://A=a&B=b".
-
-Note, this test must be run in DumpRenderTree.
-
-
</del></span></pre></div>
<a id="trunkLayoutTestsfastloaderdisallowredirecttoinvalidurlusingmetarefreshhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/loader/disallow-redirect-to-invalid-url-using-meta-refresh.html (172696 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/disallow-redirect-to-invalid-url-using-meta-refresh.html 2014-08-17 19:54:40 UTC (rev 172696)
+++ trunk/LayoutTests/fast/loader/disallow-redirect-to-invalid-url-using-meta-refresh.html 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.dumpFrameLoadCallbacks();
- testRunner.waitUntilDone();
-}
-
-if (window.internals)
- window.internals.settings.setAllowNavigationToInvalidURL(false);
-</script>
-</head>
-<body>
-<p>Tests that we do not redirect to an invalid URL initiated by &lt;meta http-equiv=&quot;refresh&quot;&gt; when setting allowNavigationToInvalidURL is false. This test PASSED if you do not see an entry in the dumped frame load callbacks of the form: &quot;willPerformClientRedirectToURL: x-dummy://A=a&amp;B=b&quot;.</p>
-<p>Note, this test must be run in DumpRenderTree.</p>
-<iframe id="frame" src="resources/redirect-to-invalid-url-using-meta-refresh.html"></iframe>
-<script>
-function done()
-{
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-window.setTimeout(done, 0);
-</script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastloaderredirecttoinvalidurlusingjavascriptcallspolicydelegateexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-javascript-calls-policy-delegate-expected.txt (0 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-javascript-calls-policy-delegate-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-javascript-calls-policy-delegate-expected.txt 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+Policy delegate: attempt to load http://A=a&B=b with navigation type 'other'
+Tests that we do not redirect to an invalid URL initiated by JavaScript. This test PASSED if you see an entry in the dumped frame load callbacks of the form: "willPerformClientRedirectToURL: http://A=a&B=b" followed by "didCancelClientRedirectForFrame".
+
+Note, this test must be run in DumpRenderTree.
</ins></span></pre></div>
<a id="trunkLayoutTestsfastloaderredirecttoinvalidurlusingjavascriptcallspolicydelegatehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-javascript-calls-policy-delegate.html (0 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-javascript-calls-policy-delegate.html (rev 0)
+++ trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-javascript-calls-policy-delegate.html 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.setCustomPolicyDelegate(true, false);
+ testRunner.waitUntilDone();
+}
+</script>
+</head>
+<body>
+<p>Tests that we do not redirect to an invalid URL initiated by JavaScript. This test PASSED if you see an entry in the dumped frame load callbacks of the form: &quot;willPerformClientRedirectToURL: http://A=a&amp;B=b&quot; followed by &quot;didCancelClientRedirectForFrame&quot;.</p>
+<p>Note, this test must be run in DumpRenderTree.</p>
+<script>
+window.location.href = "http://A=a&B=b";
+window.setTimeout(function() {
+ if (window.testRunner)
+ testRunner.notifyDone();
+}, 0);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastloaderredirecttoinvalidurlusingjavascriptdisallowedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-javascript-disallowed-expected.txt (0 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-javascript-disallowed-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-javascript-disallowed-expected.txt 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+main frame - willPerformClientRedirectToURL: http://A=a&B=b
+main frame - didFinishDocumentLoadForFrame
+main frame - didFinishLoadForFrame
+main frame - didCancelClientRedirectForFrame
+Tests that we do not redirect to an invalid URL initiated by JavaScript. This test PASSED if you see an entry in the dumped frame load callbacks of the form: "willPerformClientRedirectToURL: http://A=a&B=b" followed by "didCancelClientRedirectForFrame".
+
+Note, this test must be run in DumpRenderTree.
</ins></span></pre></div>
<a id="trunkLayoutTestsfastloaderredirecttoinvalidurlusingjavascriptdisallowedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-javascript-disallowed.html (0 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-javascript-disallowed.html (rev 0)
+++ trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-javascript-disallowed.html 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpFrameLoadCallbacks();
+ testRunner.waitUntilDone();
+}
+</script>
+</head>
+<body>
+<p>Tests that we do not redirect to an invalid URL initiated by JavaScript. This test PASSED if you see an entry in the dumped frame load callbacks of the form: &quot;willPerformClientRedirectToURL: http://A=a&amp;B=b&quot; followed by &quot;didCancelClientRedirectForFrame&quot;.</p>
+<p>Note, this test must be run in DumpRenderTree.</p>
+<script>
+window.location.href = "http://A=a&B=b";
+window.setTimeout(function() {
+ if (window.testRunner)
+ testRunner.notifyDone();
+}, 0);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastloaderredirecttoinvalidurlusingmetarefreshcallspolicydelegateexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-meta-refresh-calls-policy-delegate-expected.txt (0 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-meta-refresh-calls-policy-delegate-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-meta-refresh-calls-policy-delegate-expected.txt 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+Policy delegate: attempt to load http://A=a&B=b with navigation type 'other'
+Tests that we do not redirect to an invalid URL initiated by <meta http-equiv="refresh">. This test PASSED if you see an entry in the dumped frame load callbacks of the form: "willPerformClientRedirectToURL: http://A=a&B=b" followed by "didCancelClientRedirectForFrame".
+
+Note, this test must be run in DumpRenderTree.
</ins></span></pre></div>
<a id="trunkLayoutTestsfastloaderredirecttoinvalidurlusingmetarefreshcallspolicydelegatehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-meta-refresh-calls-policy-delegate.html (0 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-meta-refresh-calls-policy-delegate.html (rev 0)
+++ trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-meta-refresh-calls-policy-delegate.html 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="refresh" content="0; url=http://A=a&B=b">
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.setCustomPolicyDelegate(true, false);
+ testRunner.waitUntilDone();
+}
+</script>
+</head>
+<body>
+<p>Tests that we do not redirect to an invalid URL initiated by &lt;meta http-equiv=&quot;refresh&quot;&gt;. This test PASSED if you see an entry in the dumped frame load callbacks of the form: &quot;willPerformClientRedirectToURL: http://A=a&amp;B=b&quot; followed by &quot;didCancelClientRedirectForFrame&quot;.</p>
+<p>Note, this test must be run in DumpRenderTree.</p>
+<script>
+// This ugly double-timeout ensures that the scheduled meta-refresh, whose timer isn't even started until the frame finishes loading,
+// fires before notifyDone() is called, ensuring that didCancelClientRedirectForFrame is logged by DumpRenderTree.
+window.setTimeout(function() {
+ window.setTimeout(function() {
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 0);
+}, 0);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastloaderredirecttoinvalidurlusingmetarefreshdisallowedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-meta-refresh-disallowed-expected.txt (0 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-meta-refresh-disallowed-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-meta-refresh-disallowed-expected.txt 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+main frame - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+main frame - willPerformClientRedirectToURL: http://A=a&B=b
+main frame - didFinishLoadForFrame
+main frame - didCancelClientRedirectForFrame
+Tests that we do not redirect to an invalid URL initiated by <meta http-equiv="refresh">. This test PASSED if you see an entry in the dumped frame load callbacks of the form: "willPerformClientRedirectToURL: http://A=a&B=b" followed by "didCancelClientRedirectForFrame".
+
+Note, this test must be run in DumpRenderTree.
</ins></span></pre></div>
<a id="trunkLayoutTestsfastloaderredirecttoinvalidurlusingmetarefreshdisallowedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-meta-refresh-disallowed.html (0 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-meta-refresh-disallowed.html (rev 0)
+++ trunk/LayoutTests/fast/loader/redirect-to-invalid-url-using-meta-refresh-disallowed.html 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="refresh" content="0; url=http://A=a&B=b">
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpFrameLoadCallbacks();
+ testRunner.waitUntilDone();
+}
+</script>
+</head>
+<body>
+<p>Tests that we do not redirect to an invalid URL initiated by &lt;meta http-equiv=&quot;refresh&quot;&gt;. This test PASSED if you see an entry in the dumped frame load callbacks of the form: &quot;willPerformClientRedirectToURL: http://A=a&amp;B=b&quot; followed by &quot;didCancelClientRedirectForFrame&quot;.</p>
+<p>Note, this test must be run in DumpRenderTree.</p>
+<script>
+// This ugly double-timeout ensures that the scheduled meta-refresh, whose timer isn't even started until the frame finishes loading,
+// fires before notifyDone() is called, ensuring that didCancelClientRedirectForFrame is logged by DumpRenderTree.
+window.setTimeout(function() {
+ window.setTimeout(function() {
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 0);
+}, 0);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastloaderresourcesredirecttoinvalidurlusingjavascripthtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/loader/resources/redirect-to-invalid-url-using-javascript.html (172696 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/resources/redirect-to-invalid-url-using-javascript.html 2014-08-17 19:54:40 UTC (rev 172696)
+++ trunk/LayoutTests/fast/loader/resources/redirect-to-invalid-url-using-javascript.html 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -1,4 +0,0 @@
</span><del>-<!DOCTYPE html>
-<script>
-window.location.href = "x-dummy://A=a&B=b";
-</script>
</del></span></pre></div>
<a id="trunkLayoutTestsfastloaderresourcesredirecttoinvalidurlusingmetarefreshhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/loader/resources/redirect-to-invalid-url-using-meta-refresh.html (172696 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/resources/redirect-to-invalid-url-using-meta-refresh.html 2014-08-17 19:54:40 UTC (rev 172696)
+++ trunk/LayoutTests/fast/loader/resources/redirect-to-invalid-url-using-meta-refresh.html 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -1,6 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
- <meta http-equiv="refresh" content="0; url=x-dummy://A=a&B=b">
-</head>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastloaderwindowopentoinvalidurlcallspolicydelegateexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/loader/window-open-to-invalid-url-calls-policy-delegate-expected.txt (0 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/window-open-to-invalid-url-calls-policy-delegate-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/loader/window-open-to-invalid-url-calls-policy-delegate-expected.txt 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+Policy delegate: attempt to load http://A=a&B=b with navigation type 'other'
+Tests that we call the navigation policy delegate when opening a new window to an invalid URL.
+
+Note, this test must be run in DumpRenderTree.
</ins></span></pre></div>
<a id="trunkLayoutTestsfastloaderwindowopentoinvalidurlcallspolicydelegatehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/loader/window-open-to-invalid-url-calls-policy-delegate.html (0 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/window-open-to-invalid-url-calls-policy-delegate.html (rev 0)
+++ trunk/LayoutTests/fast/loader/window-open-to-invalid-url-calls-policy-delegate.html 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.setCustomPolicyDelegate(true, false);
+ testRunner.waitUntilDone();
+ testRunner.setCanOpenWindows();
+}
+</script>
+</head>
+<body>
+<p>Tests that we call the navigation policy delegate when opening a new window to an invalid URL.</p>
+<p>Note, this test must be run in DumpRenderTree.</p>
+<script>
+window.open("http://A=a&B=b", "_top");
+window.setTimeout(function() {
+ if (window.testRunner)
+ testRunner.notifyDone();
+}, 0);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastloaderwindowopentoinvalidurldisallowedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/loader/window-open-to-invalid-url-disallowed-expected.txt (0 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/window-open-to-invalid-url-disallowed-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/loader/window-open-to-invalid-url-disallowed-expected.txt 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+main frame - willPerformClientRedirectToURL: http://A=a&B=b
+main frame - didFinishDocumentLoadForFrame
+main frame - didFinishLoadForFrame
+main frame - didCancelClientRedirectForFrame
+Tests that we do not open a new window to an invalid URL. This test PASSED if you see an entry in the dumped frame load callbacks of the form: "willPerformClientRedirectToURL: http://A=a&B=b" followed by "didCancelClientRedirectForFrame".
+
+Note, this test must be run in DumpRenderTree.
</ins></span></pre></div>
<a id="trunkLayoutTestsfastloaderwindowopentoinvalidurldisallowedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/loader/window-open-to-invalid-url-disallowed.html (0 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/window-open-to-invalid-url-disallowed.html (rev 0)
+++ trunk/LayoutTests/fast/loader/window-open-to-invalid-url-disallowed.html 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpFrameLoadCallbacks();
+ testRunner.waitUntilDone();
+ testRunner.setCanOpenWindows();
+}
+</script>
+</head>
+<body>
+<p>Tests that we do not open a new window to an invalid URL. This test PASSED if you see an entry in the dumped frame load callbacks of the form: &quot;willPerformClientRedirectToURL: http://A=a&amp;B=b&quot; followed by &quot;didCancelClientRedirectForFrame&quot;.</p>
+<p>Note, this test must be run in DumpRenderTree.</p>
+<script>
+window.open("http://A=a&B=b", "_top");
+window.setTimeout(function() {
+ if (window.testRunner)
+ testRunner.notifyDone();
+}, 0);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172696 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-17 19:54:40 UTC (rev 172696)
+++ trunk/Source/WebCore/ChangeLog 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2014-08-15 Andy Estes <aestes@apple.com>
+
+ REGRESSION (r167856): adobe.com no longer able to launch Create Cloud app using a URL with a custom scheme
+ https://bugs.webkit.org/show_bug.cgi?id=136010
+
+ Reviewed by Darin Adler.
+
+ r167856 caused WebKit to stop scheduling certain kinds of navigations (window.location changes, meta-refresh,
+ and some calls to window.open) when the request URL is invalid. Adobe.com performs one of these navigations to
+ an invalid URL with an external scheme (aam:), relying on Safari's navigation policy delegate to ignore the
+ navigation and launch the external app registered to handle aam: URLs. Since the navigation is no longer
+ scheduled, the policy delegate is never executed and the external app never launches.
+
+ Instead of not scheduling the navigation, allow it to proceed until the client's policy delegate has executed
+ and made a decision. Only disallow the navigation if the policy delegate told WebKit to proceed with the load.
+ This exposes these navigations to clients via the policy delegate and via willPerformClientRedirectToURL and
+ didCancelClientRedirectForFrame on the frame load delegate.
+
+ Note that r167856 also caused an iOS regression, and this was resolved in r170120 by adding a linked-on-or-after
+ check and a WebCore setting. Since the iOS regression is also resolved by the approach described above, this
+ patch reverts r170120 (but keeps some of its tests).
+
+ Tests: fast/loader/redirect-to-invalid-url-using-javascript-calls-policy-delegate.html
+ fast/loader/redirect-to-invalid-url-using-javascript-disallowed.html
+ fast/loader/redirect-to-invalid-url-using-meta-refresh-calls-policy-delegate.html
+ fast/loader/redirect-to-invalid-url-using-meta-refresh-disallowed.html
+ fast/loader/window-open-to-invalid-url-calls-policy-delegate.html
+ fast/loader/window-open-to-invalid-url-disallowed.html
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::continueLoadAfterNavigationPolicy): Do not continue if the navigation will be a redirect
+ to an invalid URL.
+ * loader/NavigationScheduler.cpp:
+ (WebCore::NavigationScheduler::shouldScheduleNavigation): Resumed scheduling navigations to invalid URLs.
+ * page/Settings.in: Removed the allowNavigationToInvalidURL setting.
+
</ins><span class="cx"> 2014-08-15 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r164173): Safari AutoFill button in popover, default buttons on iCloud control panel and Safari Safe Browsing pages don't have default appearance
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (172696 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2014-08-17 19:54:40 UTC (rev 172696)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -2889,7 +2889,7 @@
</span><span class="cx"> return chrome.runBeforeUnloadConfirmPanel(text, &m_frame);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameLoader::continueLoadAfterNavigationPolicy(const ResourceRequest&, PassRefPtr<FormState> formState, bool shouldContinue)
</del><ins>+void FrameLoader::continueLoadAfterNavigationPolicy(const ResourceRequest& request, PassRefPtr<FormState> formState, bool shouldContinue)
</ins><span class="cx"> {
</span><span class="cx"> // If we loaded an alternate page to replace an unreachableURL, we'll get in here with a
</span><span class="cx"> // nil policyDataSource because loading the alternate page will have passed
</span><span class="lines">@@ -2898,11 +2898,14 @@
</span><span class="cx">
</span><span class="cx"> bool isTargetItem = history().provisionalItem() ? history().provisionalItem()->isTargetItem() : false;
</span><span class="cx">
</span><del>- // Two reasons we can't continue:
</del><ins>+ bool willRedirectToInvalidURL = m_quickRedirectComing && !request.url().isValid();
+
+ // Three reasons we can't continue:
</ins><span class="cx"> // 1) Navigation policy delegate said we can't so request is nil. A primary case of this
</span><span class="cx"> // is the user responding Cancel to the form repost nag sheet.
</span><span class="cx"> // 2) User responded Cancel to an alert popped up by the before unload event handler.
</span><del>- bool canContinue = shouldContinue && shouldClose();
</del><ins>+ // 3) A redirect will occur to an invalid URL.
+ bool canContinue = shouldContinue && shouldClose() && !willRedirectToInvalidURL;
</ins><span class="cx">
</span><span class="cx"> if (!canContinue) {
</span><span class="cx"> // If we were waiting for a quick redirect, but the policy delegate decided to ignore it, then we
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderNavigationSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/NavigationScheduler.cpp (172696 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/NavigationScheduler.cpp 2014-08-17 19:54:40 UTC (rev 172696)
+++ trunk/Source/WebCore/loader/NavigationScheduler.cpp 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -311,8 +311,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (protocolIsJavaScript(url))
</span><span class="cx"> return true;
</span><del>- if (!url.isValid() && !m_frame.settings().allowNavigationToInvalidURL())
- return false;
</del><span class="cx"> return NavigationDisablerForBeforeUnload::isNavigationAllowed();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.in (172696 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.in 2014-08-17 19:54:40 UTC (rev 172696)
+++ trunk/Source/WebCore/page/Settings.in 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -226,10 +226,6 @@
</span><span class="cx">
</span><span class="cx"> useImageDocumentForSubframePDF initial=false
</span><span class="cx">
</span><del>-# Allow clients to permit navigation to an invalid URL. Some apps may use invalid URLs
-# as a means to pass data from the web-portion of their app to the native portion.
-allowNavigationToInvalidURL initial=false
-
</del><span class="cx"> # Allow SourceBuffers to store up to 304MB each, enough for approximately five minutes
</span><span class="cx"> # of 1080p video and stereo audio.
</span><span class="cx"> maximumSourceBufferSize type=int, initial=318767104, conditional=MEDIA_SOURCE
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (172696 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-08-17 19:54:40 UTC (rev 172696)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-08-15 Andy Estes <aestes@apple.com>
+
+ REGRESSION (r167856): adobe.com no longer able to launch Create Cloud app using a URL with a custom scheme
+ https://bugs.webkit.org/show_bug.cgi?id=136010
+
+ Reviewed by Darin Adler.
+
+ Reverted the linked-on-or-after check added in r170120 since it is no longer necessary.
+
+ * Misc/WebKitVersionChecks.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
</ins><span class="cx"> 2014-08-16 Maciej Stachowiak <mjs@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove the obsolete WebKitEnableCoalescedUpdatesPreferenceKey
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitVersionChecksh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.h (172696 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.h 2014-08-17 19:54:40 UTC (rev 172696)
+++ trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.h 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -71,7 +71,6 @@
</span><span class="cx"> #define WEBKIT_FIRST_VERSION_WITH_CSS_ATTRIBUTE_SETTERS_IGNORING_PRIORITY 2239 // iOS 6.0
</span><span class="cx"> #define WEBKIT_FIRST_VERSION_WITH_YOUTUBE_EMBED_IFRAME_TRANSFORM 2239 // iOS 6.0
</span><span class="cx"> #define WEBKIT_FIRST_VERSION_WITHOUT_LEGACY_BACKGROUNDSIZE_SHORTHAND_BEHAVIOR 2665 // iOS 7.0
</span><del>-#define WEBKIT_FIRST_VERSION_WITH_NAVIGATION_URL_VALIDATION 3185 // iOS 8.0
</del><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (172696 => 172697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-08-17 19:54:40 UTC (rev 172696)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-08-18 04:37:53 UTC (rev 172697)
</span><span class="lines">@@ -2327,8 +2327,6 @@
</span><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> settings.setMinimumZoomFontSize([preferences _minimumZoomFontSize]);
</span><span class="cx"> #endif
</span><del>-
- settings.setAllowNavigationToInvalidURL(!WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_NAVIGATION_URL_VALIDATION));
</del><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span></span></pre>
</div>
</div>
</body>
</html>