Imported WebKit commit 9a52e27980f47e8b0d8f8b7cc0fd7b5741bceb92 (http://svn.webkit.org/repository/webkit/trunk@116736)

New snapshot to include QDeclarative* -> QQml* build fixes

1 files changed, 2 insertions, 8 deletions

diff --git a/Source/WebKit/gtk/webkit/webkitdownload.cpp b/Source/WebKit/gtk/webkit/webkitdownload.cpp
index 871db2c62..e698ed505 100644
--- a/Source/WebKit/gtk/webkit/webkitdownload.cpp
+++ b/Source/WebKit/gtk/webkit/webkitdownload.cpp
@@ -421,14 +421,11 @@ WebKitDownload* webkit_download_new_with_handle(WebKitNetworkRequest* request, W
 {
     g_return_val_if_fail(request, NULL);
 
-    ResourceHandleInternal* d = handle->getInternal();
-    if (d->m_soupMessage)
-        soup_session_pause_message(webkit_get_default_session(), d->m_soupMessage.get());
-
     WebKitDownload* download = WEBKIT_DOWNLOAD(g_object_new(WEBKIT_TYPE_DOWNLOAD, "network-request", request, NULL));
     WebKitDownloadPrivate* priv = download->priv;
 
     handle->ref();
+    handle->setDefersLoading(true);
     priv->resourceHandle = handle;
 
     webkit_download_set_response(download, response);
@@ -513,10 +510,7 @@ void webkit_download_start(WebKitDownload* download)
         priv->resourceHandle = ResourceHandle::create(/* Null NetworkingContext */ NULL, core(priv->networkRequest), priv->downloadClient, false, false);
     else {
         priv->resourceHandle->setClient(priv->downloadClient);
-
-        ResourceHandleInternal* d = priv->resourceHandle->getInternal();
-        if (d->m_soupMessage)
-            soup_session_unpause_message(webkit_get_default_session(), d->m_soupMessage.get());
+        priv->resourceHandle->setDefersLoading(false);
     }
 
     priv->timer = g_timer_new();