Diff
Modified: tags/Safari-603.1.10/Source/WebCore/ChangeLog (207700 => 207701)
--- tags/Safari-603.1.10/Source/WebCore/ChangeLog 2016-10-21 23:55:23 UTC (rev 207700)
+++ tags/Safari-603.1.10/Source/WebCore/ChangeLog 2016-10-22 00:03:57 UTC (rev 207701)
@@ -1,3 +1,21 @@
+2016-10-21 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r207700. rdar://problem/28897179
+
+ 2016-10-21 Commit Queue <commit-qu...@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
+
2016-10-21 Antti Koivisto <an...@apple.com>
Style resolver should be updated lazily
Modified: tags/Safari-603.1.10/Source/WebCore/platform/URLParser.cpp (207700 => 207701)
--- tags/Safari-603.1.10/Source/WebCore/platform/URLParser.cpp 2016-10-21 23:55:23 UTC (rev 207700)
+++ tags/Safari-603.1.10/Source/WebCore/platform/URLParser.cpp 2016-10-22 00:03:57 UTC (rev 207701)
@@ -2843,16 +2843,31 @@
// It should be able to be deduced from m_isValid and m_string.length() to save memory.
}
-static bool urlParserEnabled = true;
+enum class URLParserEnabled {
+ Undetermined,
+ Yes,
+ No
+};
+static URLParserEnabled urlParserEnabled = URLParserEnabled::Undetermined;
+
void URLParser::setEnabled(bool enabled)
{
- urlParserEnabled = enabled;
+ urlParserEnabled = enabled ? URLParserEnabled::Yes : URLParserEnabled::No;
}
bool URLParser::enabled()
{
- return urlParserEnabled;
+ 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;
}
} // namespace WebCore
Modified: tags/Safari-603.1.10/Source/WebCore/testing/js/WebCoreTestSupport.cpp (207700 => 207701)
--- tags/Safari-603.1.10/Source/WebCore/testing/js/WebCoreTestSupport.cpp 2016-10-21 23:55:23 UTC (rev 207700)
+++ tags/Safari-603.1.10/Source/WebCore/testing/js/WebCoreTestSupport.cpp 2016-10-22 00:03:57 UTC (rev 207701)
@@ -121,6 +121,11 @@
InternalSettings::setAllowsAnySSLCertificate(allowAnySSLCertificate);
}
+void setURLParserEnabled(bool enabled)
+{
+ URLParser::setEnabled(enabled);
+}
+
void installMockGamepadProvider()
{
#if ENABLE(GAMEPAD)
Modified: tags/Safari-603.1.10/Source/WebCore/testing/js/WebCoreTestSupport.h (207700 => 207701)
--- tags/Safari-603.1.10/Source/WebCore/testing/js/WebCoreTestSupport.h 2016-10-21 23:55:23 UTC (rev 207700)
+++ tags/Safari-603.1.10/Source/WebCore/testing/js/WebCoreTestSupport.h 2016-10-22 00:03:57 UTC (rev 207701)
@@ -56,6 +56,7 @@
void setLogChannelToAccumulate(const WTF::String& name) TEST_SUPPORT_EXPORT;
void initializeLogChannelsIfNecessary() TEST_SUPPORT_EXPORT;
void setAllowsAnySSLCertificate(bool) TEST_SUPPORT_EXPORT;
+void setURLParserEnabled(bool) TEST_SUPPORT_EXPORT;
void installMockGamepadProvider() TEST_SUPPORT_EXPORT;
void connectMockGamepad(unsigned index) TEST_SUPPORT_EXPORT;
Modified: tags/Safari-603.1.10/Tools/ChangeLog (207700 => 207701)
--- tags/Safari-603.1.10/Tools/ChangeLog 2016-10-21 23:55:23 UTC (rev 207700)
+++ tags/Safari-603.1.10/Tools/ChangeLog 2016-10-22 00:03:57 UTC (rev 207701)
@@ -1,3 +1,21 @@
+2016-10-21 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r207700. rdar://problem/28897179
+
+ 2016-10-21 Commit Queue <commit-qu...@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
+
2016-10-21 Csaba Osztrogonác <o...@webkit.org>
[EFL] REGRESSION(r207616): Build is broken due to missing libgeoclue-dev package
Modified: tags/Safari-603.1.10/Tools/DumpRenderTree/mac/DumpRenderTree.mm (207700 => 207701)
--- tags/Safari-603.1.10/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-10-21 23:55:23 UTC (rev 207700)
+++ tags/Safari-603.1.10/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-10-22 00:03:57 UTC (rev 207701)
@@ -1411,6 +1411,7 @@
int DumpRenderTreeMain(int argc, const char *argv[])
{
+ WebCoreTestSupport::setURLParserEnabled(true);
atexit(atexitFunction);
#if PLATFORM(IOS)
Modified: tags/Safari-603.1.10/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadInvalidURLRequest.mm (207700 => 207701)
--- tags/Safari-603.1.10/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadInvalidURLRequest.mm 2016-10-21 23:55:23 UTC (rev 207700)
+++ tags/Safari-603.1.10/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadInvalidURLRequest.mm 2016-10-22 00:03:57 UTC (rev 207701)
@@ -54,8 +54,8 @@
- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(NSError *)error
{
- EXPECT_WK_STREQ(error.domain, @"NSURLErrorDomain");
- EXPECT_EQ(error.code, -1003);
+ EXPECT_WK_STREQ(error.domain, @"WebKitErrorDomain");
+ EXPECT_EQ(error.code, WebKitErrorCannotShowURL);
EXPECT_TRUE([error.userInfo[@"NSErrorFailingURLKey"] isEqual:literalURL(literal)]);
didFailProvisionalLoad = true;
Modified: tags/Safari-603.1.10/Tools/TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm (207700 => 207701)
--- tags/Safari-603.1.10/Tools/TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm 2016-10-21 23:55:23 UTC (rev 207700)
+++ tags/Safari-603.1.10/Tools/TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm 2016-10-22 00:03:57 UTC (rev 207701)
@@ -77,7 +77,7 @@
didFailProvisionalLoad = false;
Util::run(&didFinishTest);
- EXPECT_FALSE(didFailProvisionalLoad);
+ EXPECT_TRUE(didFailProvisionalLoad);
}
}
Modified: tags/Safari-603.1.10/Tools/WebKitTestRunner/TestController.cpp (207700 => 207701)
--- tags/Safari-603.1.10/Tools/WebKitTestRunner/TestController.cpp 2016-10-21 23:55:23 UTC (rev 207700)
+++ tags/Safari-603.1.10/Tools/WebKitTestRunner/TestController.cpp 2016-10-22 00:03:57 UTC (rev 207701)
@@ -115,6 +115,7 @@
TestController::TestController(int argc, const char* argv[])
{
+ WebCoreTestSupport::setURLParserEnabled(true);
initialize(argc, argv);
controller = this;
run();
