<!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>[201352] branches/safari-602.1.32.5-branch</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/201352">201352</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-05-24 14:30:11 -0700 (Tue, 24 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/200799">r200799</a>. rdar://problem/25931513</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6021325branchLayoutTestsChangeLog">branches/safari-602.1.32.5-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6021325branchLayoutTestsfastloaderiframesrcinvalidurlexpectedtxt">branches/safari-602.1.32.5-branch/LayoutTests/fast/loader/iframe-src-invalid-url-expected.txt</a></li>
<li><a href="#branchessafari6021325branchLayoutTestsfastloaderiframesrcinvalidurlhtml">branches/safari-602.1.32.5-branch/LayoutTests/fast/loader/iframe-src-invalid-url.html</a></li>
<li><a href="#branchessafari6021325branchLayoutTestsplatformiossimulatorwk1TestExpectations">branches/safari-602.1.32.5-branch/LayoutTests/platform/ios-simulator-wk1/TestExpectations</a></li>
<li><a href="#branchessafari6021325branchLayoutTestsplatformmacwk1TestExpectations">branches/safari-602.1.32.5-branch/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#branchessafari6021325branchLayoutTestsplatformwinTestExpectations">branches/safari-602.1.32.5-branch/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#branchessafari6021325branchSourceWebCoreChangeLog">branches/safari-602.1.32.5-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6021325branchSourceWebCoreloaderSubframeLoadercpp">branches/safari-602.1.32.5-branch/Source/WebCore/loader/SubframeLoader.cpp</a></li>
<li><a href="#branchessafari6021325branchSourceWebCoreloaderSubframeLoaderh">branches/safari-602.1.32.5-branch/Source/WebCore/loader/SubframeLoader.h</a></li>
<li><a href="#branchessafari6021325branchSourceWebCorepageSettingsin">branches/safari-602.1.32.5-branch/Source/WebCore/page/Settings.in</a></li>
<li><a href="#branchessafari6021325branchSourceWebKitmacChangeLog">branches/safari-602.1.32.5-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6021325branchSourceWebKitmacWebViewWebViewmm">branches/safari-602.1.32.5-branch/Source/WebKit/mac/WebView/WebView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6021325branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32.5-branch/LayoutTests/ChangeLog (201351 => 201352)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32.5-branch/LayoutTests/ChangeLog 2016-05-24 21:12:33 UTC (rev 201351)
+++ branches/safari-602.1.32.5-branch/LayoutTests/ChangeLog 2016-05-24 21:30:11 UTC (rev 201352)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-05-24 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r200799. rdar://problem/25931513
+
+ 2016-05-12 Jiewen Tan <jiewen_tan@apple.com>
+
+ REGRESSION (r199313): ICBC app: text field In the webview is not tappable
+ https://bugs.webkit.org/show_bug.cgi?id=157396
+ <rdar://problem/25931513>
+
+ Reviewed by David Kilzer.
+
+ The previous test is actually bogus, and therefore modify it to do the
+ real task.
+
+ * fast/loader/iframe-src-invalid-url-expected.txt:
+ * fast/loader/iframe-src-invalid-url.html:
+ * platform/ios-simulator-wk1/TestExpectations:
+ * platform/mac-wk1/TestExpectations:
+ * platform/win/TestExpectations:
+
</ins><span class="cx"> 2016-05-20 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r201227. rdar://problem/24577706
</span></span></pre></div>
<a id="branchessafari6021325branchLayoutTestsfastloaderiframesrcinvalidurlexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32.5-branch/LayoutTests/fast/loader/iframe-src-invalid-url-expected.txt (201351 => 201352)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32.5-branch/LayoutTests/fast/loader/iframe-src-invalid-url-expected.txt 2016-05-24 21:12:33 UTC (rev 201351)
+++ branches/safari-602.1.32.5-branch/LayoutTests/fast/loader/iframe-src-invalid-url-expected.txt 2016-05-24 21:30:11 UTC (rev 201352)
</span><span class="lines">@@ -1,13 +1,7 @@
</span><del>-Test passes if the first child frame prints about:blank.
</del><ins>+ - decidePolicyForNavigationAction
+<NSURLRequest URL data:text/html, <iframe id='iframe' src='<p>FAILURE</p>'></iframe>, main document URL iframe-src-invalid-url.html, http method GET> is main frame - no should open URLs externally - no
+ - decidePolicyForNavigationAction
+<NSURLRequest URL about:blank, main document URL iframe-src-invalid-url.html, http method GET> is main frame - no should open URLs externally - no
+Test passes if the second iframe navigates to about:blank.
</ins><span class="cx">
</span><span class="cx">
</span><del>-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-about:blank
-
---------
-Frame: 'iframe'
---------
-
</del></span></pre></div>
<a id="branchessafari6021325branchLayoutTestsfastloaderiframesrcinvalidurlhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32.5-branch/LayoutTests/fast/loader/iframe-src-invalid-url.html (201351 => 201352)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32.5-branch/LayoutTests/fast/loader/iframe-src-invalid-url.html 2016-05-24 21:12:33 UTC (rev 201351)
+++ branches/safari-602.1.32.5-branch/LayoutTests/fast/loader/iframe-src-invalid-url.html 2016-05-24 21:30:11 UTC (rev 201352)
</span><span class="lines">@@ -4,14 +4,13 @@
</span><span class="cx"> <script>
</span><span class="cx"> if (window.testRunner) {
</span><span class="cx"> testRunner.dumpAsText();
</span><del>- testRunner.dumpChildFramesAsText();
</del><ins>+ testRunner.dumpPolicyDelegateCallbacks();
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>- <p>Test passes if the first child frame prints about:blank.</p>
</del><ins>+ <p>Test passes if the second iframe navigates to about:blank.</p>
</ins><span class="cx"> <iframe src="data:text/html,
</span><del>- <iframe id='iframe' src='<p>FAILURE</p>'></iframe>
- <script>document.write(document.getElementById('iframe').contentWindow.location.href);</script>"></iframe>
</del><ins>+ <iframe id='iframe' src='<p>FAILURE</p>'></iframe>"></iframe>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari6021325branchLayoutTestsplatformiossimulatorwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32.5-branch/LayoutTests/platform/ios-simulator-wk1/TestExpectations (201351 => 201352)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32.5-branch/LayoutTests/platform/ios-simulator-wk1/TestExpectations 2016-05-24 21:12:33 UTC (rev 201351)
+++ branches/safari-602.1.32.5-branch/LayoutTests/platform/ios-simulator-wk1/TestExpectations 2016-05-24 21:30:11 UTC (rev 201352)
</span><span class="lines">@@ -1366,3 +1366,6 @@
</span><span class="cx">
</span><span class="cx"> # This test relies on a settings option that we can only set with WKRT.
</span><span class="cx"> js/dom/regress-157246.html
</span><ins>+
+# dumpPolicyDelegateCallbacks is not supported in DumpRenderTree
+fast/loader/iframe-src-invalid-url.html [ Skip ]
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari6021325branchLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32.5-branch/LayoutTests/platform/mac-wk1/TestExpectations (201351 => 201352)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32.5-branch/LayoutTests/platform/mac-wk1/TestExpectations 2016-05-24 21:12:33 UTC (rev 201351)
+++ branches/safari-602.1.32.5-branch/LayoutTests/platform/mac-wk1/TestExpectations 2016-05-24 21:30:11 UTC (rev 201352)
</span><span class="lines">@@ -216,3 +216,6 @@
</span><span class="cx">
</span><span class="cx"> # This test relies on a settings option that we can only set with WKRT.
</span><span class="cx"> js/dom/regress-157246.html
</span><ins>+
+# dumpPolicyDelegateCallbacks is not supported in DumpRenderTree
+fast/loader/iframe-src-invalid-url.html [ Skip ]
</ins></span></pre></div>
<a id="branchessafari6021325branchLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32.5-branch/LayoutTests/platform/win/TestExpectations (201351 => 201352)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32.5-branch/LayoutTests/platform/win/TestExpectations 2016-05-24 21:12:33 UTC (rev 201351)
+++ branches/safari-602.1.32.5-branch/LayoutTests/platform/win/TestExpectations 2016-05-24 21:30:11 UTC (rev 201352)
</span><span class="lines">@@ -3387,3 +3387,6 @@
</span><span class="cx">
</span><span class="cx"> # This test relies on iOS-specific font fallback.
</span><span class="cx"> fast/text/arabic-blacklisted-expected.html [ Pass ImageOnlyFailure ]
</span><ins>+
+# dumpPolicyDelegateCallbacks is not supported in DumpRenderTree
+fast/loader/iframe-src-invalid-url.html [ Skip ]
</ins></span></pre></div>
<a id="branchessafari6021325branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32.5-branch/Source/WebCore/ChangeLog (201351 => 201352)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32.5-branch/Source/WebCore/ChangeLog 2016-05-24 21:12:33 UTC (rev 201351)
+++ branches/safari-602.1.32.5-branch/Source/WebCore/ChangeLog 2016-05-24 21:30:11 UTC (rev 201352)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-05-24 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r200799. rdar://problem/25931513
+
+ 2016-05-12 Jiewen Tan <jiewen_tan@apple.com>
+
+ REGRESSION (r199313): ICBC app: text field In the webview is not tappable
+ https://bugs.webkit.org/show_bug.cgi?id=157396
+ <rdar://problem/25931513>
+
+ Reviewed by David Kilzer.
+
+ Add a quirk for WebKit1 apps.
+
+ * loader/SubframeLoader.cpp:
+ (WebCore::SubframeLoader::requestFrame):
+ Even though the HTML spec suggests that we should navigate to about:blank
+ for subframes/iframes, of which the src cannot be resolved to an valid URL,
+ many existing WebKit1 apps are relying on invalid URLs to bridge their WebView
+ codes and their native Objective-C codes. Therefore, a quirk is added to
+ escape the URL validation for existing WebKit1 apps.
+ (WebCore::SubframeLoader::shouldConvertInvalidURLsToBlank):
+ * loader/SubframeLoader.h:
+ * page/Settings.in:
+
</ins><span class="cx"> 2016-05-22 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r201241. rdar://problem/26396532
</span></span></pre></div>
<a id="branchessafari6021325branchSourceWebCoreloaderSubframeLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32.5-branch/Source/WebCore/loader/SubframeLoader.cpp (201351 => 201352)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32.5-branch/Source/WebCore/loader/SubframeLoader.cpp 2016-05-24 21:12:33 UTC (rev 201351)
+++ branches/safari-602.1.32.5-branch/Source/WebCore/loader/SubframeLoader.cpp 2016-05-24 21:30:11 UTC (rev 201352)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> } else
</span><span class="cx"> url = completeURL(urlString);
</span><span class="cx">
</span><del>- if (!url.isValid())
</del><ins>+ if (shouldConvertInvalidURLsToBlank() && !url.isValid())
</ins><span class="cx"> url = blankURL();
</span><span class="cx">
</span><span class="cx"> Frame* frame = loadOrRedirectSubframe(ownerElement, url, frameName, lockHistory, lockBackForwardList);
</span><span class="lines">@@ -450,4 +450,11 @@
</span><span class="cx"> return m_frame.document()->completeURL(url);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool SubframeLoader::shouldConvertInvalidURLsToBlank() const
+{
+ if (Settings* settings = document() ? document()->settings() : nullptr)
+ return settings->shouldConvertInvalidURLsToBlank();
+ return true;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="branchessafari6021325branchSourceWebCoreloaderSubframeLoaderh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32.5-branch/Source/WebCore/loader/SubframeLoader.h (201351 => 201352)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32.5-branch/Source/WebCore/loader/SubframeLoader.h 2016-05-24 21:12:33 UTC (rev 201351)
+++ branches/safari-602.1.32.5-branch/Source/WebCore/loader/SubframeLoader.h 2016-05-24 21:30:11 UTC (rev 201352)
</span><span class="lines">@@ -84,6 +84,8 @@
</span><span class="cx">
</span><span class="cx"> Document* document() const;
</span><span class="cx">
</span><ins>+ bool shouldConvertInvalidURLsToBlank() const;
+
</ins><span class="cx"> bool m_containsPlugins;
</span><span class="cx"> Frame& m_frame;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6021325branchSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32.5-branch/Source/WebCore/page/Settings.in (201351 => 201352)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32.5-branch/Source/WebCore/page/Settings.in 2016-05-24 21:12:33 UTC (rev 201351)
+++ branches/safari-602.1.32.5-branch/Source/WebCore/page/Settings.in 2016-05-24 21:30:11 UTC (rev 201352)
</span><span class="lines">@@ -266,3 +266,4 @@
</span><span class="cx">
</span><span class="cx"> selectionPaintingWithoutSelectionGapsEnabled initial=false
</span><span class="cx">
</span><ins>+shouldConvertInvalidURLsToBlank initial=true
</ins></span></pre></div>
<a id="branchessafari6021325branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32.5-branch/Source/WebKit/mac/ChangeLog (201351 => 201352)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32.5-branch/Source/WebKit/mac/ChangeLog 2016-05-24 21:12:33 UTC (rev 201351)
+++ branches/safari-602.1.32.5-branch/Source/WebKit/mac/ChangeLog 2016-05-24 21:30:11 UTC (rev 201352)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-05-24 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r200799. rdar://problem/25931513
+
+ 2016-05-12 Jiewen Tan <jiewen_tan@apple.com>
+
+ REGRESSION (r199313): ICBC app: text field In the webview is not tappable
+ https://bugs.webkit.org/show_bug.cgi?id=157396
+ <rdar://problem/25931513>
+
+ Reviewed by David Kilzer.
+
+ Add a quirk for WebKit1 apps.
+
+ * WebView/WebView.mm:
+ (shouldConvertInvalidURLsToBlank):
+ (-[WebView _preferencesChanged:]):
+
</ins><span class="cx"> 2016-05-20 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r201227. rdar://problem/24577706
</span></span></pre></div>
<a id="branchessafari6021325branchSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32.5-branch/Source/WebKit/mac/WebView/WebView.mm (201351 => 201352)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32.5-branch/Source/WebKit/mac/WebView/WebView.mm 2016-05-24 21:12:33 UTC (rev 201351)
+++ branches/safari-602.1.32.5-branch/Source/WebKit/mac/WebView/WebView.mm 2016-05-24 21:30:11 UTC (rev 201352)
</span><span class="lines">@@ -877,6 +877,19 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool shouldConvertInvalidURLsToBlank()
+{
+#if PLATFORM(IOS)
+ static bool shouldConvertInvalidURLsToBlank = dyld_get_program_sdk_version() >= 0x000A0000;
+#elif PLATFORM(MAC)
+ static bool shouldConvertInvalidURLsToBlank = dyld_get_program_sdk_version() >= 0x000A0C00;
+#else
+ static bool shouldConvertInvalidURLsToBlank = true;
+#endif
+
+ return shouldConvertInvalidURLsToBlank;
+}
+
</ins><span class="cx"> #if ENABLE(GAMEPAD)
</span><span class="cx"> static void WebKitInitializeGamepadProviderIfNecessary()
</span><span class="cx"> {
</span><span class="lines">@@ -2528,6 +2541,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> settings.setAllowContentSecurityPolicySourceStarToMatchAnyProtocol(shouldAllowContentSecurityPolicySourceStarToMatchAnyProtocol());
</span><ins>+
+ settings.setShouldConvertInvalidURLsToBlank(shouldConvertInvalidURLsToBlank());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline IMP getMethod(id o, SEL s)
</span></span></pre>
</div>
</div>
</body>
</html>