Title: [106467] trunk/Source/WebKit/gtk
- Revision
- 106467
- Author
- [email protected]
- Date
- 2012-02-01 08:50:33 -0800 (Wed, 01 Feb 2012)
Log Message
[GTK] unittests/testloading crashes
https://bugs.webkit.org/show_bug.cgi?id=77544
Patch by Philippe Normand <[email protected]> on 2012-02-01
Reviewed by Xan Lopez.
* WebCoreSupport/FrameLoaderClientGtk.cpp:
(WebKit::FrameLoaderClient::dispatchDidFailLoading): Bail out
early from dispatchDidFailLoading if the error is the result of an
interrupted load.
Modified Paths
Diff
Modified: trunk/Source/WebKit/gtk/ChangeLog (106466 => 106467)
--- trunk/Source/WebKit/gtk/ChangeLog 2012-02-01 14:54:32 UTC (rev 106466)
+++ trunk/Source/WebKit/gtk/ChangeLog 2012-02-01 16:50:33 UTC (rev 106467)
@@ -1,3 +1,15 @@
+2012-02-01 Philippe Normand <[email protected]>
+
+ [GTK] unittests/testloading crashes
+ https://bugs.webkit.org/show_bug.cgi?id=77544
+
+ Reviewed by Xan Lopez.
+
+ * WebCoreSupport/FrameLoaderClientGtk.cpp:
+ (WebKit::FrameLoaderClient::dispatchDidFailLoading): Bail out
+ early from dispatchDidFailLoading if the error is the result of an
+ interrupted load.
+
2012-02-01 Philippe Normand <[email protected]> and Sergio Villar Senin <[email protected]>
Reviewed by Martin Robinson.
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp (106466 => 106467)
--- trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp 2012-02-01 14:54:32 UTC (rev 106466)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp 2012-02-01 16:50:33 UTC (rev 106467)
@@ -1049,6 +1049,12 @@
WebKitWebView* webView = getViewFromFrame(m_frame);
GOwnPtr<gchar> identifierString(toString(identifier));
WebKitWebResource* webResource = webkit_web_view_get_resource(webView, identifierString.get());
+
+ // A NULL WebResource means the load has been interrupted, and
+ // replaced by another one while this resource was being loaded.
+ if (!webResource)
+ return;
+
GOwnPtr<GError> webError(g_error_new_literal(g_quark_from_string(error.domain().utf8().data()),
error.errorCode(),
error.localizedDescription().utf8().data()));
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
