Title: [100640] trunk
- Revision
- 100640
- Author
- ser...@webkit.org
- Date
- 2011-11-17 09:49:30 -0800 (Thu, 17 Nov 2011)
Log Message
[GTK] plugins/get-url-notify-with-url-that-fails-to-load.html on bots after r100466
https://bugs.webkit.org/show_bug.cgi?id=72613
Reviewed by Martin Robinson.
Source/WebCore:
Do not assume that a SoupRequest always exists, it is not
generated for example when the provided URL is
invalid. ResourceHandle::platformSetDefersLoading was crashing
because of that.
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::ResourceHandle::platformSetDefersLoading):
LayoutTests:
Added a test that times out in WK2.
* platform/gtk-wk2/Skipped: added plugins/get-url-notify-with-url-that-fails-to-load.html
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (100639 => 100640)
--- trunk/LayoutTests/ChangeLog 2011-11-17 17:40:26 UTC (rev 100639)
+++ trunk/LayoutTests/ChangeLog 2011-11-17 17:49:30 UTC (rev 100640)
@@ -1,3 +1,14 @@
+2011-11-17 Sergio Villar Senin <svil...@igalia.com>
+
+ [GTK] plugins/get-url-notify-with-url-that-fails-to-load.html on bots after r100466
+ https://bugs.webkit.org/show_bug.cgi?id=72613
+
+ Reviewed by Martin Robinson.
+
+ Added a test that times out in WK2.
+
+ * platform/gtk-wk2/Skipped: added plugins/get-url-notify-with-url-that-fails-to-load.html
+
2011-11-17 Steve Block <stevebl...@google.com>
ASSERTION FAILED: fontCache()->generation() == m_generation (running new-run-webkit-tests)
Modified: trunk/LayoutTests/platform/gtk-wk2/Skipped (100639 => 100640)
--- trunk/LayoutTests/platform/gtk-wk2/Skipped 2011-11-17 17:40:26 UTC (rev 100639)
+++ trunk/LayoutTests/platform/gtk-wk2/Skipped 2011-11-17 17:49:30 UTC (rev 100640)
@@ -74,6 +74,7 @@
editing/undo/undo-deleteWord.html
editing/pasteboard/emacs-ctrl-a-k-y.html
editing/input/emacs-ctrl-o.html
+plugins/get-url-notify-with-url-that-fails-to-load.html
###############################################################################
# TESTS CRASHING
Modified: trunk/Source/WebCore/ChangeLog (100639 => 100640)
--- trunk/Source/WebCore/ChangeLog 2011-11-17 17:40:26 UTC (rev 100639)
+++ trunk/Source/WebCore/ChangeLog 2011-11-17 17:49:30 UTC (rev 100640)
@@ -1,3 +1,18 @@
+2011-11-17 Sergio Villar Senin <svil...@igalia.com>
+
+ [GTK] plugins/get-url-notify-with-url-that-fails-to-load.html on bots after r100466
+ https://bugs.webkit.org/show_bug.cgi?id=72613
+
+ Reviewed by Martin Robinson.
+
+ Do not assume that a SoupRequest always exists, it is not
+ generated for example when the provided URL is
+ invalid. ResourceHandle::platformSetDefersLoading was crashing
+ because of that.
+
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::ResourceHandle::platformSetDefersLoading):
+
2011-11-17 Vsevolod Vlasov <vse...@chromium.org>
Web Inspector: Remove onlineDetectionEnabled from Preferences
Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (100639 => 100640)
--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2011-11-17 17:40:26 UTC (rev 100639)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2011-11-17 17:49:30 UTC (rev 100640)
@@ -747,8 +747,11 @@
if (defersLoading)
return;
- if (!hasBeenSent(this)) {
- ASSERT(d->m_soupRequest);
+ // We need to check for d->m_soupRequest because the request may
+ // have raised a failure (for example invalid URLs). We cannot
+ // simply check for d->m_scheduledFailure because it's cleared as
+ // soon as the failure event is fired.
+ if (!hasBeenSent(this) && d->m_soupRequest) {
d->m_cancellable = adoptGRef(g_cancellable_new());
soup_request_send_async(d->m_soupRequest.get(), d->m_cancellable.get(), sendRequestCallback, this);
return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
