Changeset 184376 in webkit

Timestamp:

May 15, 2015, 1:03:16 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

REGRESSION(r183861): [SOUP] Downloads are broken when using the Network Process
​https://bugs.webkit.org/show_bug.cgi?id=144738

Reviewed by Alexey Proskuryakov.

Source/WebCore:

Add ResourceHandle::releaseForDownload() that releases the current
handle to be used as a download.

• platform/network/ResourceHandle.h:
• platform/network/soup/ResourceHandleSoup.cpp:

(WebCore::ResourceHandle::releaseForDownload):

Source/WebKit2:

When converting the main resource handle to a download, the
NetworkResourceLoader is aborted, and the ResourceHandle is
cleaned up aborting the download operation. We need to use a
different ResourceHandle for the download operation.

• Shared/Downloads/soup/DownloadSoup.cpp:

(WebKit::Download::startWithHandle): Use ResourceHandle::releaseForDownload()
instead of reusing the given handle.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/ResourceHandle.h (modified) (1 diff)
• WebCore/platform/network/soup/ResourceHandleSoup.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/Downloads/soup/DownloadSoup.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-14  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(r183861): [SOUP] Downloads are broken when using the Network Process
+        https://bugs.webkit.org/show_bug.cgi?id=144738
+
+        Reviewed by Alexey Proskuryakov.
+
+        Add ResourceHandle::releaseForDownload() that releases the current
+        handle to be used as a download.
+
+        * platform/network/ResourceHandle.h:
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::ResourceHandle::releaseForDownload):
+
 2015-05-15  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/platform/network/ResourceHandle.h

@@ -178 +178 @@
 
 #if USE(SOUP)
+    RefPtr<ResourceHandle> releaseForDownload(ResourceHandleClient*);
     void continueDidReceiveAuthenticationChallenge(const Credential& credentialFromPersistentStorage);
     void sendPendingRequest();

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

@@ -1028 +1028 @@
 }
 
+RefPtr<ResourceHandle> ResourceHandle::releaseForDownload(ResourceHandleClient* downloadClient)
+{
+    // We don't adopt the ref, as it will be released by cleanupSoupRequestOperation, which should always run.
+    RefPtr<ResourceHandle> newHandle = new ResourceHandle(d->m_context.get(), firstRequest(), nullptr, d->m_defersLoading, d->m_shouldContentSniff);
+    std::swap(d, newHandle->d);
+
+    g_signal_handlers_disconnect_matched(newHandle->d->m_soupMessage.get(), G_SIGNAL_MATCH_DATA, 0, 0, nullptr, nullptr, this);
+    g_object_set_data(G_OBJECT(newHandle->d->m_soupMessage.get()), "handle", newHandle.get());
+
+    newHandle->d->m_client = downloadClient;
+    continueAfterDidReceiveResponse(newHandle.get());
+
+    return newHandle;
+}
+
 void ResourceHandle::sendPendingRequest()
 {

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-05-14  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(r183861): [SOUP] Downloads are broken when using the Network Process
+        https://bugs.webkit.org/show_bug.cgi?id=144738
+
+        Reviewed by Alexey Proskuryakov.
+
+        When converting the main resource handle to a download, the
+        NetworkResourceLoader is aborted, and the ResourceHandle is
+        cleaned up aborting the download operation. We need to use a
+        different ResourceHandle for the download operation.
+
+        * Shared/Downloads/soup/DownloadSoup.cpp:
+        (WebKit::Download::startWithHandle): Use ResourceHandle::releaseForDownload()
+        instead of reusing the given handle.
+
 2015-05-14  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp

@@ -231 +231 @@
     ASSERT(!m_resourceHandle);
     m_downloadClient = std::make_unique<DownloadClient>(this);
-    resourceHandle->setClient(m_downloadClient.get());
-    m_resourceHandle = resourceHandle;
+    m_resourceHandle = resourceHandle->releaseForDownload(m_downloadClient.get());
     didStart();
     static_cast<DownloadClient*>(m_downloadClient.get())->handleResponseLater(response);