<!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>[207700] 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/207700">207700</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-10-21 16:55:23 -0700 (Fri, 21 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/207582">r207582</a>.
https://bugs.webkit.org/show_bug.cgi?id=163819
Not quite ready rdar://problem/28897179 (Requested by
alexchristensen on #webkit).
Reverted changeset:
"Re-enable URLParser for non-Safari Cocoa apps after <a href="http://trac.webkit.org/projects/webkit/changeset/207321">r207321</a>"
https://bugs.webkit.org/show_bug.cgi?id=163690
http://trac.webkit.org/changeset/207582
Patch by Commit Queue <commit-queue@webkit.org> on 2016-10-21</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformURLParsercpp">trunk/Source/WebCore/platform/URLParser.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingjsWebCoreTestSupportcpp">trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingjsWebCoreTestSupporth">trunk/Source/WebCore/testing/js/WebCoreTestSupport.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaLoadInvalidURLRequestmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadInvalidURLRequest.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacLoadInvalidURLRequestmm">trunk/Tools/TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207699 => 207700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-21 23:20:11 UTC (rev 207699)
+++ trunk/Source/WebCore/ChangeLog 2016-10-21 23:55:23 UTC (rev 207700)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-21 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r207582.
+ https://bugs.webkit.org/show_bug.cgi?id=163819
+
+ Not quite ready rdar://problem/28897179 (Requested by
+ alexchristensen on #webkit).
+
+ Reverted changeset:
+
+ "Re-enable URLParser for non-Safari Cocoa apps after r207321"
+ https://bugs.webkit.org/show_bug.cgi?id=163690
+ http://trac.webkit.org/changeset/207582
+
</ins><span class="cx"> 2016-10-21 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> WebPage should take UserActivity directly for user input
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (207699 => 207700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp 2016-10-21 23:20:11 UTC (rev 207699)
+++ trunk/Source/WebCore/platform/URLParser.cpp 2016-10-21 23:55:23 UTC (rev 207700)
</span><span class="lines">@@ -2843,16 +2843,31 @@
</span><span class="cx"> // It should be able to be deduced from m_isValid and m_string.length() to save memory.
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool urlParserEnabled = true;
</del><ins>+enum class URLParserEnabled {
+ Undetermined,
+ Yes,
+ No
+};
</ins><span class="cx">
</span><ins>+static URLParserEnabled urlParserEnabled = URLParserEnabled::Undetermined;
+
</ins><span class="cx"> void URLParser::setEnabled(bool enabled)
</span><span class="cx"> {
</span><del>- urlParserEnabled = enabled;
</del><ins>+ urlParserEnabled = enabled ? URLParserEnabled::Yes : URLParserEnabled::No;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool URLParser::enabled()
</span><span class="cx"> {
</span><del>- return urlParserEnabled;
</del><ins>+ if (urlParserEnabled == URLParserEnabled::Undetermined) {
+#if PLATFORM(MAC)
+ urlParserEnabled = MacApplication::isSafari() ? URLParserEnabled::Yes : URLParserEnabled::No;
+#elif PLATFORM(IOS)
+ urlParserEnabled = IOSApplication::isMobileSafari() ? URLParserEnabled::Yes : URLParserEnabled::No;
+#else
+ urlParserEnabled = URLParserEnabled::Yes;
+#endif
+ }
+ return urlParserEnabled == URLParserEnabled::Yes;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoretestingjsWebCoreTestSupportcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp (207699 => 207700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp 2016-10-21 23:20:11 UTC (rev 207699)
+++ trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp 2016-10-21 23:55:23 UTC (rev 207700)
</span><span class="lines">@@ -121,6 +121,11 @@
</span><span class="cx"> InternalSettings::setAllowsAnySSLCertificate(allowAnySSLCertificate);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void setURLParserEnabled(bool enabled)
+{
+ URLParser::setEnabled(enabled);
+}
+
</ins><span class="cx"> void installMockGamepadProvider()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(GAMEPAD)
</span></span></pre></div>
<a id="trunkSourceWebCoretestingjsWebCoreTestSupporth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/js/WebCoreTestSupport.h (207699 => 207700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/js/WebCoreTestSupport.h 2016-10-21 23:20:11 UTC (rev 207699)
+++ trunk/Source/WebCore/testing/js/WebCoreTestSupport.h 2016-10-21 23:55:23 UTC (rev 207700)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> void setLogChannelToAccumulate(const WTF::String& name) TEST_SUPPORT_EXPORT;
</span><span class="cx"> void initializeLogChannelsIfNecessary() TEST_SUPPORT_EXPORT;
</span><span class="cx"> void setAllowsAnySSLCertificate(bool) TEST_SUPPORT_EXPORT;
</span><ins>+void setURLParserEnabled(bool) TEST_SUPPORT_EXPORT;
</ins><span class="cx">
</span><span class="cx"> void installMockGamepadProvider() TEST_SUPPORT_EXPORT;
</span><span class="cx"> void connectMockGamepad(unsigned index) TEST_SUPPORT_EXPORT;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (207699 => 207700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-10-21 23:20:11 UTC (rev 207699)
+++ trunk/Tools/ChangeLog 2016-10-21 23:55:23 UTC (rev 207700)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-21 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r207582.
+ https://bugs.webkit.org/show_bug.cgi?id=163819
+
+ Not quite ready rdar://problem/28897179 (Requested by
+ alexchristensen on #webkit).
+
+ Reverted changeset:
+
+ "Re-enable URLParser for non-Safari Cocoa apps after r207321"
+ https://bugs.webkit.org/show_bug.cgi?id=163690
+ http://trac.webkit.org/changeset/207582
+
</ins><span class="cx"> 2016-10-21 Jonathan Bedard <jbedard@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKitTestRunnerApp packages .idl file
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (207699 => 207700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-10-21 23:20:11 UTC (rev 207699)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-10-21 23:55:23 UTC (rev 207700)
</span><span class="lines">@@ -1411,6 +1411,7 @@
</span><span class="cx">
</span><span class="cx"> int DumpRenderTreeMain(int argc, const char *argv[])
</span><span class="cx"> {
</span><ins>+ WebCoreTestSupport::setURLParserEnabled(true);
</ins><span class="cx"> atexit(atexitFunction);
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaLoadInvalidURLRequestmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadInvalidURLRequest.mm (207699 => 207700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadInvalidURLRequest.mm 2016-10-21 23:20:11 UTC (rev 207699)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadInvalidURLRequest.mm 2016-10-21 23:55:23 UTC (rev 207700)
</span><span class="lines">@@ -54,8 +54,8 @@
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(NSError *)error
</span><span class="cx"> {
</span><del>- EXPECT_WK_STREQ(error.domain, @"NSURLErrorDomain");
- EXPECT_EQ(error.code, -1003);
</del><ins>+ EXPECT_WK_STREQ(error.domain, @"WebKitErrorDomain");
+ EXPECT_EQ(error.code, WebKitErrorCannotShowURL);
</ins><span class="cx"> EXPECT_TRUE([error.userInfo[@"NSErrorFailingURLKey"] isEqual:literalURL(literal)]);
</span><span class="cx">
</span><span class="cx"> didFailProvisionalLoad = true;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacLoadInvalidURLRequestmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm (207699 => 207700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm 2016-10-21 23:20:11 UTC (rev 207699)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm 2016-10-21 23:55:23 UTC (rev 207700)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> didFailProvisionalLoad = false;
</span><span class="cx"> Util::run(&didFinishTest);
</span><span class="cx">
</span><del>- EXPECT_FALSE(didFailProvisionalLoad);
</del><ins>+ EXPECT_TRUE(didFailProvisionalLoad);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (207699 => 207700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2016-10-21 23:20:11 UTC (rev 207699)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2016-10-21 23:55:23 UTC (rev 207700)
</span><span class="lines">@@ -115,6 +115,7 @@
</span><span class="cx">
</span><span class="cx"> TestController::TestController(int argc, const char* argv[])
</span><span class="cx"> {
</span><ins>+ WebCoreTestSupport::setURLParserEnabled(true);
</ins><span class="cx"> initialize(argc, argv);
</span><span class="cx"> controller = this;
</span><span class="cx"> run();
</span></span></pre>
</div>
</div>
</body>
</html>