Changeset 116117 in webkit

Timestamp:

May 4, 2012 10:12:28 AM (12 years ago)

Author:

danw@gnome.org

Message:

[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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/soup/ResourceHandleSoup.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-04  Dan Winship  <danw@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-03  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp

@@ -341 +341 @@
     }
 
+    if (d->m_defersLoading) {
+        d->m_deferredResult = res;
+        return;
+    }
+
 #if ENABLE(WEB_TIMING)
     if (d->m_response.resourceLoadTiming())
@@ -363 +368 @@
         }
         d->m_response.updateFromSoupMessage(soupMessage);
-
-        if (d->m_defersLoading)
-            soup_session_pause_message(d->soupSession(), soupMessage);
     } else {
         d->m_response.setURL(handle->firstRequest().url());
@@ -752 +754 @@
     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);
     }
 }