Changeset 207582 in webkit

Timestamp:

Oct 19, 2016 5:47:39 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Re-enable URLParser for non-Safari Cocoa apps after r207321
​https://bugs.webkit.org/show_bug.cgi?id=163690

Patch by Alex Christensen <​achristensen@webkit.org> on 2016-10-19
Reviewed by Darin Adler.

Source/WebCore:

I disabled the URLParser for non-Safari applications in r207305
to give me time to make URLParser more compatible, which I did in r207321

Updated some API tests which will be investigated in
​https://bugs.webkit.org/show_bug.cgi?id=163127

• platform/URLParser.cpp:

(WebCore::URLParser::setEnabled):
(WebCore::URLParser::enabled):

• testing/js/WebCoreTestSupport.cpp:

(WebCoreTestSupport::setURLParserEnabled): Deleted.

• testing/js/WebCoreTestSupport.h:

Tools:

• DumpRenderTree/mac/DumpRenderTree.mm:

(DumpRenderTreeMain):

• TestWebKitAPI/Tests/WebKit2Cocoa/LoadInvalidURLRequest.mm:

(-[LoadInvalidURLNavigationActionDelegate webView:didFailProvisionalNavigation:withError:]):

• TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm:

(TestWebKitAPI::TEST):

• WebKitTestRunner/TestController.cpp:

(WTR::TestController::TestController):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/URLParser.cpp (modified) (1 diff)
• Source/WebCore/testing/js/WebCoreTestSupport.cpp (modified) (1 diff)
• Source/WebCore/testing/js/WebCoreTestSupport.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/mac/DumpRenderTree.mm (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadInvalidURLRequest.mm (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm (modified) (1 diff)
• Tools/WebKitTestRunner/TestController.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-19  Alex Christensen  <achristensen@webkit.org>
+
+        Re-enable URLParser for non-Safari Cocoa apps after r207321
+        https://bugs.webkit.org/show_bug.cgi?id=163690
+
+        Reviewed by Darin Adler.
+
+        I disabled the URLParser for non-Safari applications in r207305
+        to give me time to make URLParser more compatible, which I did in r207321
+
+        Updated some API tests which will be investigated in 
+        https://bugs.webkit.org/show_bug.cgi?id=163127
+
+        * platform/URLParser.cpp:
+        (WebCore::URLParser::setEnabled):
+        (WebCore::URLParser::enabled):
+        * testing/js/WebCoreTestSupport.cpp:
+        (WebCoreTestSupport::setURLParserEnabled): Deleted.
+        * testing/js/WebCoreTestSupport.h:
+
 2016-10-19  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/platform/URLParser.cpp

@@ -2844 +2844 @@
 }
 
-enum class URLParserEnabled {
-    Undetermined,
-    Yes,
-    No
-};
-
-static URLParserEnabled urlParserEnabled = URLParserEnabled::Undetermined;
+static bool urlParserEnabled = true;
 
 void URLParser::setEnabled(bool enabled)
 {
-    urlParserEnabled = enabled ? URLParserEnabled::Yes : URLParserEnabled::No;
+    urlParserEnabled = enabled;
 }
 
 bool URLParser::enabled()
 {
-    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;
+    return urlParserEnabled;
 }
 

trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp

@@ -122 +122 @@
 }
 
-void setURLParserEnabled(bool enabled)
-{
-    URLParser::setEnabled(enabled);
-}
-
 void installMockGamepadProvider()
 {

trunk/Source/WebCore/testing/js/WebCoreTestSupport.h

@@ -57 +57 @@
 void initializeLogChannelsIfNecessary() TEST_SUPPORT_EXPORT;
 void setAllowsAnySSLCertificate(bool) TEST_SUPPORT_EXPORT;
-void setURLParserEnabled(bool) TEST_SUPPORT_EXPORT;
 
 void installMockGamepadProvider() TEST_SUPPORT_EXPORT;

trunk/Tools/ChangeLog

@@ +1 @@
+2016-10-19  Alex Christensen  <achristensen@webkit.org>
+
+        Re-enable URLParser for non-Safari Cocoa apps after r207321
+        https://bugs.webkit.org/show_bug.cgi?id=163690
+
+        Reviewed by Darin Adler.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (DumpRenderTreeMain):
+        * TestWebKitAPI/Tests/WebKit2Cocoa/LoadInvalidURLRequest.mm:
+        (-[LoadInvalidURLNavigationActionDelegate webView:didFailProvisionalNavigation:withError:]):
+        * TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm:
+        (TestWebKitAPI::TEST):
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::TestController):
+
 2016-10-19  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -1412 +1412 @@
 int DumpRenderTreeMain(int argc, const char *argv[])
 {
-    WebCoreTestSupport::setURLParserEnabled(true);
     atexit(atexitFunction);
 

trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadInvalidURLRequest.mm

@@ -55 +55 @@
 - (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(NSError *)error
 {
-    EXPECT_WK_STREQ(error.domain, @"WebKitErrorDomain");
-    EXPECT_EQ(error.code, WebKitErrorCannotShowURL);
+    EXPECT_WK_STREQ(error.domain, @"NSURLErrorDomain");
+    EXPECT_EQ(error.code, -1003);
     EXPECT_TRUE([error.userInfo[@"NSErrorFailingURLKey"] isEqual:literalURL(literal)]);
 

trunk/Tools/TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm

@@ -78 +78 @@
         Util::run(&didFinishTest);
 
-        EXPECT_TRUE(didFailProvisionalLoad);
+        EXPECT_FALSE(didFailProvisionalLoad);
     }
 }

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -116 +116 @@
 TestController::TestController(int argc, const char* argv[])
 {
-    WebCoreTestSupport::setURLParserEnabled(true);
     initialize(argc, argv);
     controller = this;