[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 334460ecfd0a61a74994e251b64fd6eaaa3c07bd
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 24 09:25:30 2010 +0000

    2010-11-24  Sheriff Bot  <webkit.review.bot at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72649 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ae314cd..9134119 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-24  Sheriff Bot  <webkit.review.bot at 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 at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebCore/platform/network/soup/ResourceHandleSoup.cpp b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
index 7a1084e..0f97867 100644
--- a/WebCore/platform/network/soup/ResourceHandleSoup.cpp
+++ b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
@@ -545,9 +545,6 @@ static void sendRequestCallback(GObject* source, GAsyncResult* res, gpointer use
         }
     }
 
-    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);
 }
@@ -657,11 +654,8 @@ static bool startHttp(ResourceHandle* handle)
     if (!soup_message_headers_get_one(soupMessage->request_headers, "Accept"))
         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;
 }
@@ -734,28 +728,9 @@ bool ResourceHandle::supportsBufferedData()
     return false;
 }
 
-void ResourceHandle::platformSetDefersLoading(bool defersLoading)
+void ResourceHandle::platformSetDefersLoading(bool)
 {
-    // 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());
+    notImplemented();
 }
 
 bool ResourceHandle::loadsBlocked()

-- 
WebKit Debian packaging