Changeset 249193 in webkit

Timestamp:

Aug 28, 2019, 3:21:12 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

REGRESSION(r243434): Wrong URL passed to WebKitWebView::load-failed when cancelling previous load
​https://bugs.webkit.org/show_bug.cgi?id=201176

Reviewed by Žan Doberšek.

Use the current provisional/committed url when faking an error event, instead of the current active URI that can
be the pending api request of a new load.

• UIProcess/API/glib/WebKitWebView.cpp:

(webkitWebViewWillStartLoad):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/glib/WebKitWebView.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-08-28  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(r243434): Wrong URL passed to WebKitWebView::load-failed when cancelling previous load
+        https://bugs.webkit.org/show_bug.cgi?id=201176
+
+        Reviewed by Žan Doberšek.
+
+        Use the current provisional/committed url when faking an error event, instead of the current active URI that can
+        be the pending api request of a new load.
+
+        * UIProcess/API/glib/WebKitWebView.cpp:
+        (webkitWebViewWillStartLoad):
+
 2019-08-28  Claudio Saavedra  <csaavedra@igalia.com>
 

trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp

@@ -2099 +2099 @@
     GUniquePtr<GError> error(g_error_new_literal(WEBKIT_NETWORK_ERROR, WEBKIT_NETWORK_ERROR_CANCELLED, _("Load request cancelled")));
     webkitWebViewLoadFailed(webView, pageLoadState.isProvisional() ? WEBKIT_LOAD_STARTED : WEBKIT_LOAD_COMMITTED,
-        webView->priv->activeURI.data(), error.get());
+        pageLoadState.isProvisional() ? pageLoadState.provisionalURL().utf8().data() : pageLoadState.url().utf8().data(),
+        error.get());
 }