Changeset 173726 in webkit

Timestamp:

Sep 18, 2014 10:36:45 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

Incorrect pending API request URL when loading an HTML string
​https://bugs.webkit.org/show_bug.cgi?id=136913

Reviewed by Alexey Proskuryakov.

Use about:blank as pending API request URL when the given base URL
is empty, otherwise use the given base URL.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::loadHTMLString):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-09-18  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Incorrect pending API request URL when loading an HTML string
+        https://bugs.webkit.org/show_bug.cgi?id=136913
+
+        Reviewed by Alexey Proskuryakov.
+
+        Use about:blank as pending API request URL when the given base URL
+        is empty, otherwise use the given base URL.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::loadHTMLString):
+
 2014-09-18  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -793 +793 @@
     auto transaction = m_pageLoadState.transaction();
 
-    String pendingAPIRequestURL = baseURL.isEmpty() ? baseURL : ASCIILiteral("about:blank");
-    m_pageLoadState.setPendingAPIRequestURL(transaction, pendingAPIRequestURL);
+    m_pageLoadState.setPendingAPIRequestURL(transaction, !baseURL.isEmpty() ? baseURL : ASCIILiteral("about:blank"));
 
     if (!isValid())