Title: [208526] trunk
Revision
208526
Author
[email protected]
Date
2016-11-09 23:46:17 -0800 (Wed, 09 Nov 2016)

Log Message

[WK2][!NETWORK_SESSION] Add support for downloading file backed blobs
https://bugs.webkit.org/show_bug.cgi?id=164522

Reviewed by Alex Christensen.

Source/WebKit2:

Add support for downloading file backed blobs for the non-NETWORK_SESSION
code path of WebKit2, which is still use on pre-Sierra macOS.

* NetworkProcess/Downloads/Download.cpp:
(WebKit::Download::~Download):
* NetworkProcess/Downloads/Download.h:
(WebKit::Download::setBlobFileReferences):
* NetworkProcess/Downloads/DownloadManager.cpp:
(WebKit::DownloadManager::startDownload):
(WebKit::DownloadManager::convertNetworkLoadToDownload):
* NetworkProcess/Downloads/DownloadManager.h:
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::convertToDownload):

LayoutTests:

Unskip corresponding tests now that they pass on Yosemite and El Capitan.

* platform/mac-wk2/TestExpectations:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (208525 => 208526)


--- trunk/LayoutTests/ChangeLog	2016-11-10 07:46:01 UTC (rev 208525)
+++ trunk/LayoutTests/ChangeLog	2016-11-10 07:46:17 UTC (rev 208526)
@@ -1,3 +1,14 @@
+2016-11-09  Chris Dumez  <[email protected]>
+
+        [WK2][!NETWORK_SESSION] Add support for downloading file backed blobs
+        https://bugs.webkit.org/show_bug.cgi?id=164522
+
+        Reviewed by Alex Christensen.
+
+        Unskip corresponding tests now that they pass on Yosemite and El Capitan.
+
+        * platform/mac-wk2/TestExpectations:
+
 2016-11-09  Joseph Pecoraro  <[email protected]>
 
         Web Inspector: DebuggerManager.Event.Resumed introduces test flakiness

Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (208525 => 208526)


--- trunk/LayoutTests/platform/mac-wk2/TestExpectations	2016-11-10 07:46:01 UTC (rev 208525)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations	2016-11-10 07:46:17 UTC (rev 208526)
@@ -494,10 +494,6 @@
 # rdar://problem/26885345
 [ Sierra+ ] media/click-placeholder-not-pausing.html [ Pass ]
 
-# Download of file backed blob URLs is broken for !NETWORK_SESSION code path.
-webkit.org/b/164522 [ Yosemite ElCapitan ] fast/dom/HTMLAnchorElement/anchor-file-blob-convert-to-download.html [ Failure ]
-webkit.org/b/164522 [ Yosemite ElCapitan ] fast/dom/HTMLAnchorElement/anchor-file-blob-download.html [ Failure ]
-
 # RTL Scrollbars are enabled on Sierra WebKit2.
 [ Sierra+ ] fast/scrolling/rtl-scrollbars.html [ Pass ]
 [ Sierra+ ] fast/scrolling/rtl-scrollbars-simple.html [ Pass ]

Modified: trunk/Source/WebKit2/ChangeLog (208525 => 208526)


--- trunk/Source/WebKit2/ChangeLog	2016-11-10 07:46:01 UTC (rev 208525)
+++ trunk/Source/WebKit2/ChangeLog	2016-11-10 07:46:17 UTC (rev 208526)
@@ -1,5 +1,26 @@
 2016-11-09  Chris Dumez  <[email protected]>
 
+        [WK2][!NETWORK_SESSION] Add support for downloading file backed blobs
+        https://bugs.webkit.org/show_bug.cgi?id=164522
+
+        Reviewed by Alex Christensen.
+
+        Add support for downloading file backed blobs for the non-NETWORK_SESSION
+        code path of WebKit2, which is still use on pre-Sierra macOS.
+
+        * NetworkProcess/Downloads/Download.cpp:
+        (WebKit::Download::~Download):
+        * NetworkProcess/Downloads/Download.h:
+        (WebKit::Download::setBlobFileReferences):
+        * NetworkProcess/Downloads/DownloadManager.cpp:
+        (WebKit::DownloadManager::startDownload):
+        (WebKit::DownloadManager::convertNetworkLoadToDownload):
+        * NetworkProcess/Downloads/DownloadManager.h:
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::convertToDownload):
+
+2016-11-09  Chris Dumez  <[email protected]>
+
         [WK2][NETWORK_SESSION] Add support for downloading file backed blobs
         https://bugs.webkit.org/show_bug.cgi?id=164458
         <rdar://problem/28905514>

Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp (208525 => 208526)


--- trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp	2016-11-10 07:46:01 UTC (rev 208525)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp	2016-11-10 07:46:17 UTC (rev 208526)
@@ -85,6 +85,9 @@
 Download::~Download()
 {
 #if !USE(NETWORK_SESSION)
+    for (auto& fileReference : m_blobFileReferences)
+        fileReference->revokeFileAccess();
+
     if (m_resourceHandle) {
         m_resourceHandle->clearClient();
         m_resourceHandle->cancel();

Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h (208525 => 208526)


--- trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h	2016-11-10 07:46:01 UTC (rev 208525)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h	2016-11-10 07:46:17 UTC (rev 208526)
@@ -58,6 +58,7 @@
 
 namespace WebCore {
 class AuthenticationChallenge;
+class BlobDataFileReference;
 class Credential;
 class ResourceError;
 class ResourceHandle;
@@ -86,6 +87,8 @@
     ~Download();
 
 #if !USE(NETWORK_SESSION)
+    void setBlobFileReferences(Vector<RefPtr<WebCore::BlobDataFileReference>>&& fileReferences) { m_blobFileReferences = WTFMove(fileReferences); }
+
     void start();
     void startWithHandle(WebCore::ResourceHandle*, const WebCore::ResourceResponse&);
 #endif
@@ -132,6 +135,7 @@
     DownloadManager& m_downloadManager;
     DownloadID m_downloadID;
 
+    Vector<RefPtr<WebCore::BlobDataFileReference>> m_blobFileReferences;
     RefPtr<SandboxExtension> m_sandboxExtension;
 
 #if USE(NETWORK_SESSION)

Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp (208525 => 208526)


--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp	2016-11-10 07:46:01 UTC (rev 208525)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp	2016-11-10 07:46:17 UTC (rev 208526)
@@ -57,11 +57,17 @@
     parameters.request = request;
     parameters.clientCredentialPolicy = ClientCredentialPolicy::MayAskClientForCredentials;
     if (request.url().protocolIsBlob() && connection)
-        parameters.blobFileReferences = NetworkBlobRegistry::singleton().filesInBlob(*connection, parameters.request.url());
+        parameters.blobFileReferences = NetworkBlobRegistry::singleton().filesInBlob(*connection, request.url());
 
     m_pendingDownloads.add(downloadID, std::make_unique<PendingDownload>(WTFMove(parameters), downloadID, *networkSession, suggestedName));
 #else
     auto download = std::make_unique<Download>(*this, downloadID, request, suggestedName);
+    if (request.url().protocolIsBlob() && connection) {
+        auto blobFileReferences = NetworkBlobRegistry::singleton().filesInBlob(*connection, request.url());
+        for (auto& fileReference : blobFileReferences)
+            fileReference->prepareForFileAccess();
+        download->setBlobFileReferences(WTFMove(blobFileReferences));
+    }
     download->start();
 
     ASSERT(!m_downloads.contains(downloadID));
@@ -105,7 +111,7 @@
 }
 #endif // USE(NETWORK_SESSION)
 
-void DownloadManager::convertNetworkLoadToDownload(DownloadID downloadID, std::unique_ptr<NetworkLoad>&& networkLoad, const ResourceRequest& request, const ResourceResponse& response)
+void DownloadManager::convertNetworkLoadToDownload(DownloadID downloadID, std::unique_ptr<NetworkLoad>&& networkLoad, Vector<RefPtr<WebCore::BlobDataFileReference>>&& blobFileReferences, const ResourceRequest& request, const ResourceResponse& response)
 {
 #if USE(NETWORK_SESSION)
     ASSERT(!m_pendingDownloads.contains(downloadID));
@@ -112,6 +118,7 @@
     m_pendingDownloads.add(downloadID, std::make_unique<PendingDownload>(WTFMove(networkLoad), downloadID, request, response));
 #else
     auto download = std::make_unique<Download>(*this, downloadID, request);
+    download->setBlobFileReferences(WTFMove(blobFileReferences));
 
     auto* handle = networkLoad->handle();
     ASSERT(handle);

Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h (208525 => 208526)


--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h	2016-11-10 07:46:01 UTC (rev 208525)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h	2016-11-10 07:46:17 UTC (rev 208526)
@@ -36,6 +36,7 @@
 #include <wtf/Noncopyable.h>
 
 namespace WebCore {
+class BlobDataFileReference;
 class ResourceHandle;
 class ResourceRequest;
 class ResourceResponse;
@@ -83,7 +84,7 @@
     void continueWillSendRequest(DownloadID, WebCore::ResourceRequest&&);
     void willDecidePendingDownloadDestination(NetworkDataTask&, ResponseCompletionHandler&&);
 #endif
-    void convertNetworkLoadToDownload(DownloadID, std::unique_ptr<NetworkLoad>&&, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
+    void convertNetworkLoadToDownload(DownloadID, std::unique_ptr<NetworkLoad>&&, Vector<RefPtr<WebCore::BlobDataFileReference>>&&, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
     void continueDecidePendingDownloadDestination(DownloadID, String destination, const SandboxExtension::Handle&, bool allowOverwrite);
 
     void resumeDownload(WebCore::SessionID, DownloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);

Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (208525 => 208526)


--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp	2016-11-10 07:46:01 UTC (rev 208525)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp	2016-11-10 07:46:17 UTC (rev 208526)
@@ -283,7 +283,7 @@
 void NetworkResourceLoader::convertToDownload(DownloadID downloadID, const ResourceRequest& request, const ResourceResponse& response)
 {
     ASSERT(m_networkLoad);
-    NetworkProcess::singleton().downloadManager().convertNetworkLoadToDownload(downloadID, WTFMove(m_networkLoad), request, response);
+    NetworkProcess::singleton().downloadManager().convertNetworkLoadToDownload(downloadID, WTFMove(m_networkLoad), WTFMove(m_fileReferences), request, response);
 }
 
 void NetworkResourceLoader::abort()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to