Changeset 72649 in webkit

Timestamp:

Nov 24, 2010 1:25:30 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-11-24 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r72647.
​http://trac.webkit.org/changeset/72647
​https://bugs.webkit.org/show_bug.cgi?id=50009

breaks the http layout tests (Requested by philn-tp on
#webkit).

• platform/network/soup/ResourceHandleSoup.cpp: (WebCore::sendRequestCallback): (WebCore::startHttp): (WebCore::ResourceHandle::platformSetDefersLoading):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-24  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r72647.
+        http://trac.webkit.org/changeset/72647
+        https://bugs.webkit.org/show_bug.cgi?id=50009
+
+        breaks the http layout tests (Requested by philn-tp on
+        #webkit).
+
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::sendRequestCallback):
+        (WebCore::startHttp):
+        (WebCore::ResourceHandle::platformSetDefersLoading):
+
 2010-11-23  Philippe Normand  <pnormand@igalia.com>
 

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

@@ -546 +546 @@
     }
 
-    if (d->m_defersLoading)
-         soup_session_pause_message(handle->defaultSession(), d->m_soupMessage.get());
-
     g_input_stream_read_async(d->m_inputStream.get(), d->m_buffer, READ_BUFFER_SIZE,
                               G_PRIORITY_DEFAULT, d->m_cancellable.get(), readCallback, 0);
@@ -658 +655 @@
         soup_message_headers_append(soupMessage->request_headers, "Accept", "*/*");
 
-    // Send the request only if it's not been explicitely deferred.
-    if (!d->m_defersLoading) {
-        d->m_cancellable = adoptPlatformRef(g_cancellable_new());
-        webkit_soup_request_send_async(d->m_soupRequest.get(), d->m_cancellable.get(), sendRequestCallback, 0);
-    }
+    d->m_cancellable = adoptPlatformRef(g_cancellable_new());
+    webkit_soup_request_send_async(d->m_soupRequest.get(), d->m_cancellable.get(), sendRequestCallback, 0);
 
     return true;
@@ -735 +729 @@
 }
 
-void ResourceHandle::platformSetDefersLoading(bool defersLoading)
-{
-    // Initial implementation of this method was required for bug #44157.
-
-    if (d->m_cancelled)
-        return;
-
-    if (!defersLoading && !d->m_cancellable && d->m_soupRequest.get()) {
-        d->m_cancellable = adoptPlatformRef(g_cancellable_new());
-        webkit_soup_request_send_async(d->m_soupRequest.get(), d->m_cancellable.get(), sendRequestCallback, 0);
-        return;
-    }
-
-    // Only supported for http(s) transfers. Something similar would
-    // probably be needed for data transfers done with GIO.
-    if (!d->m_soupMessage)
-        return;
-
-    if (defersLoading)
-        soup_session_pause_message(defaultSession(), d->m_soupMessage.get());
-    else
-        soup_session_unpause_message(defaultSession(), d->m_soupMessage.get());
+void ResourceHandle::platformSetDefersLoading(bool)
+{
+    notImplemented();
 }