Title: [249193] trunk/Source/WebKit
- Revision
- 249193
- Author
- [email protected]
- Date
- 2019-08-28 03:21:12 -0700 (Wed, 28 Aug 2019)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (249192 => 249193)
--- trunk/Source/WebKit/ChangeLog 2019-08-28 10:15:36 UTC (rev 249192)
+++ trunk/Source/WebKit/ChangeLog 2019-08-28 10:21:12 UTC (rev 249193)
@@ -1,3 +1,16 @@
+2019-08-28 Carlos Garcia Campos <[email protected]>
+
+ 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 <[email protected]>
[GTK][WPE] Implement HSTS for the soup network backend
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp (249192 => 249193)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp 2019-08-28 10:15:36 UTC (rev 249192)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp 2019-08-28 10:21:12 UTC (rev 249193)
@@ -2098,7 +2098,8 @@
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());
}
void webkitWebViewLoadChanged(WebKitWebView* webView, WebKitLoadEvent loadEvent)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
