Title: [122008] releases/WebKitGTK/webkit-1.8/Source/WebCore
- Revision
- 122008
- Author
- mrobin...@webkit.org
- Date
- 2012-07-06 13:03:35 -0700 (Fri, 06 Jul 2012)
Log Message
Merge 116117 - [GTK] ASSERTION FAILED: shouldLoadAsEmptyDocument(r.url()) ||
!defersLoading() in MainResourceLoader.cpp:382
Remove a soup_session_pause_message() call that got left behind,
update the defersLoading stuff to handle this case.
https://bugs.webkit.org/show_bug.cgi?id=85159
Patch by Dan Winship <d...@gnome.org> on 2012-05-04
Reviewed by Martin Robinson.
No new tests. Now passes loader/load-defer-resume-crash.html under
debug build.
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::sendRequestCallback):
(WebCore::ResourceHandle::platformSetDefersLoading):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog (122007 => 122008)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog 2012-07-06 20:03:28 UTC (rev 122007)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog 2012-07-06 20:03:35 UTC (rev 122008)
@@ -1,3 +1,22 @@
+2012-05-04 Dan Winship <d...@gnome.org>
+
+ [GTK] ASSERTION FAILED: shouldLoadAsEmptyDocument(r.url()) ||
+ !defersLoading() in MainResourceLoader.cpp:382
+
+ Remove a soup_session_pause_message() call that got left behind,
+ update the defersLoading stuff to handle this case.
+
+ https://bugs.webkit.org/show_bug.cgi?id=85159
+
+ Reviewed by Martin Robinson.
+
+ No new tests. Now passes loader/load-defer-resume-crash.html under
+ debug build.
+
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::sendRequestCallback):
+ (WebCore::ResourceHandle::platformSetDefersLoading):
+
2012-05-04 Christophe Dumez <christophe.du...@intel.com>
[soup] URL of the ResourceResponse passed to willSendRequest is incorrect
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (122007 => 122008)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2012-07-06 20:03:28 UTC (rev 122007)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2012-07-06 20:03:35 UTC (rev 122008)
@@ -353,6 +353,11 @@
return;
}
+ if (d->m_defersLoading) {
+ d->m_deferredResult = res;
+ return;
+ }
+
GOwnPtr<GError> error;
GInputStream* in = soup_request_send_finish(d->m_soupRequest.get(), res, &error.outPtr());
if (error) {
@@ -370,9 +375,6 @@
d->m_response.setSniffedContentType(sniffedType);
}
d->m_response.updateFromSoupMessage(soupMessage);
-
- if (d->m_defersLoading)
- soup_session_pause_message(d->soupSession(), soupMessage);
} else {
d->m_response.setURL(handle->firstRequest().url());
const gchar* contentType = soup_request_get_content_type(d->m_soupRequest.get());
@@ -648,7 +650,11 @@
if (d->m_deferredResult) {
GRefPtr<GAsyncResult> asyncResult = adoptGRef(d->m_deferredResult.leakRef());
- readCallback(G_OBJECT(d->m_inputStream.get()), asyncResult.get(), this);
+
+ if (d->m_inputStream)
+ readCallback(G_OBJECT(d->m_inputStream.get()), asyncResult.get(), this);
+ else
+ sendRequestCallback(G_OBJECT(d->m_soupRequest.get()), asyncResult.get(), this);
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
