Changeset 280562 in webkit

Timestamp:

Aug 2, 2021 3:04:46 PM (12 months ago)

Author:

achristensen@apple.com

Message:

Don't change invalid baseURLs from loadData or loadHTMLString to about:blank
​https://bugs.webkit.org/show_bug.cgi?id=228717
<rdar://79909343>

Reviewed by Chris Dumez.

Source/WebKit:

r278737 fixed a compatibility bug from r272469 but introduced a crash when the base URL does not successfully parse.
r279450 fixed that crash but introduced a new behavior change that changes the URL to about:blank. This didn't seem
to change anything because window.location is about:blank with and without the change, but WKWebView.URL did change,
which broke at least one app. This undoes the functionality change from r279450 and keeps the crash fix, which are
both covered by API tests. I also manually verified this fixes the app in the radar.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::loadData):

Tools:

• TestWebKitAPI/Tests/WebKitCocoa/LoadAlternateHTMLString.mm:

(TEST):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/LoadAlternateHTMLString.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-08-02  Alex Christensen  <achristensen@webkit.org>
+
+        Don't change invalid baseURLs from loadData or loadHTMLString to about:blank
+        https://bugs.webkit.org/show_bug.cgi?id=228717
+        <rdar://79909343>
+
+        Reviewed by Chris Dumez.
+
+        r278737 fixed a compatibility bug from r272469 but introduced a crash when the base URL does not successfully parse.
+        r279450 fixed that crash but introduced a new behavior change that changes the URL to about:blank.  This didn't seem
+        to change anything because window.location is about:blank with and without the change, but WKWebView.URL did change,
+        which broke at least one app.  This undoes the functionality change from r279450 and keeps the crash fix, which are
+        both covered by API tests.  I also manually verified this fixes the app in the radar.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::loadData):
+
 2021-08-02  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -1760 +1760 @@
     else {
         baseURL = URL(URL(), loadParameters.baseURLString);
-        if (baseURL.isValid()) {
-            if (!baseURL.protocolIsInHTTPFamily())
-                LegacySchemeRegistry::registerURLSchemeAsHandledBySchemeHandler(baseURL.protocol().toString());
-        } else
-            baseURL = aboutBlankURL();
+        if (baseURL.isValid() && !baseURL.protocolIsInHTTPFamily())
+            LegacySchemeRegistry::registerURLSchemeAsHandledBySchemeHandler(baseURL.protocol().toString());
     }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2021-08-02  Alex Christensen  <achristensen@webkit.org>
+
+        Don't change invalid baseURLs from loadData or loadHTMLString to about:blank
+        https://bugs.webkit.org/show_bug.cgi?id=228717
+        <rdar://79909343>
+
+        Reviewed by Chris Dumez.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/LoadAlternateHTMLString.mm:
+        (TEST):
+
 2021-08-02  Kevin Neal  <kevin_neal@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/LoadAlternateHTMLString.mm

@@ -196 +196 @@
     [webView loadHTMLString:@"test" baseURL:[NSURL URLWithString:@"invalid"]];
     TestWebKitAPI::Util::run(&didFinishNavigation);
+    EXPECT_WK_STREQ([webView URL].absoluteString, "invalid");
 
     EXPECT_FALSE(didCrash);