Attachment 361255 Details for Bug 194027 – patch to fix tests

[patch] patch to fix tests

patch_to_fix_tests (text/plain), 6.92 KB, created by Alex Christensen on 2019-02-05 17:28:02 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-02-05 17:28:02 PST

Size: 6.92 KB

patch

obsolete

>Index: Source/WebKit/NetworkProcess/Downloads/DownloadManager.cpp
>===================================================================
>--- Source/WebKit/NetworkProcess/Downloads/DownloadManager.cpp	(revision 240984)
>+++ Source/WebKit/NetworkProcess/Downloads/DownloadManager.cpp	(working copy)
>@@ -43,7 +43,7 @@
> {
> }
> 
>-void DownloadManager::startDownload(NetworkConnectionToWebProcess* connection, PAL::SessionID sessionID, DownloadID downloadID, const ResourceRequest& request, const String& suggestedName)
>+void DownloadManager::startDownload(PAL::SessionID sessionID, DownloadID downloadID, const ResourceRequest& request, const String& suggestedName)
> {
>     auto* networkSession = client().networkSession(sessionID);
>     if (!networkSession)
>@@ -53,11 +53,11 @@
>     parameters.sessionID = sessionID;
>     parameters.request = request;
>     parameters.clientCredentialPolicy = ClientCredentialPolicy::MayAskClientForCredentials;
>-    if (request.url().protocolIsBlob() && connection)
>-        parameters.blobFileReferences = connection->filesInBlob(request.url());
>+    if (request.url().protocolIsBlob())
>+        parameters.blobFileReferences = client().networkBlobRegistry().filesInBlob(request.url());
>     parameters.storedCredentialsPolicy = sessionID.isEphemeral() ? StoredCredentialsPolicy::DoNotUse : StoredCredentialsPolicy::Use;
> 
>-    m_pendingDownloads.add(downloadID, std::make_unique<PendingDownload>(m_client.parentProcessConnectionForDownloads(), WTFMove(parameters), downloadID, *networkSession, connection ? &connection->blobRegistry() : nullptr, suggestedName));
>+    m_pendingDownloads.add(downloadID, std::make_unique<PendingDownload>(m_client.parentProcessConnectionForDownloads(), WTFMove(parameters), downloadID, *networkSession, &client().networkBlobRegistry().blobRegistry(), suggestedName));
> }
> 
> void DownloadManager::dataTaskBecameDownloadTask(DownloadID downloadID, std::unique_ptr<Download>&& download)
>Index: Source/WebKit/NetworkProcess/Downloads/DownloadManager.h
>===================================================================
>--- Source/WebKit/NetworkProcess/Downloads/DownloadManager.h	(revision 240983)
>+++ Source/WebKit/NetworkProcess/Downloads/DownloadManager.h	(working copy)
>@@ -55,6 +55,7 @@
> 
> class AuthenticationManager;
> class Download;
>+class NetworkBlobRegistry;
> class NetworkConnectionToWebProcess;
> class NetworkLoad;
> class PendingDownload;
>@@ -74,6 +75,7 @@
>         virtual AuthenticationManager& downloadsAuthenticationManager() = 0;
>         virtual void pendingDownloadCanceled(DownloadID) = 0;
>         virtual NetworkSession* networkSession(const PAL::SessionID&) const = 0;
>+        virtual NetworkBlobRegistry& networkBlobRegistry() = 0;
>         virtual void ref() const = 0;
>         virtual void deref() const = 0;
>     };
>@@ -80,7 +82,7 @@
> 
>     explicit DownloadManager(Client&);
> 
>-    void startDownload(NetworkConnectionToWebProcess*, PAL::SessionID, DownloadID, const WebCore::ResourceRequest&, const String& suggestedName = { });
>+    void startDownload(PAL::SessionID, DownloadID, const WebCore::ResourceRequest&, const String& suggestedName = { });
>     void dataTaskBecameDownloadTask(DownloadID, std::unique_ptr<Download>&&);
>     void continueWillSendRequest(DownloadID, WebCore::ResourceRequest&&);
>     void willDecidePendingDownloadDestination(NetworkDataTask&, ResponseCompletionHandler&&);
>Index: Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
>===================================================================
>--- Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp	(revision 240984)
>+++ Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp	(working copy)
>@@ -441,7 +441,7 @@
> 
> void NetworkConnectionToWebProcess::startDownload(PAL::SessionID sessionID, DownloadID downloadID, const ResourceRequest& request, const String& suggestedName)
> {
>-    m_networkProcess->downloadManager().startDownload(this, sessionID, downloadID, request, suggestedName);
>+    m_networkProcess->downloadManager().startDownload(sessionID, downloadID, request, suggestedName);
> }
> 
> void NetworkConnectionToWebProcess::convertMainResourceLoadToDownload(PAL::SessionID sessionID, uint64_t mainResourceLoadIdentifier, DownloadID downloadID, const ResourceRequest& request, const ResourceResponse& response)
>@@ -450,7 +450,7 @@
> 
>     // In case a response is served from service worker, we do not have yet the ability to convert the load.
>     if (!mainResourceLoadIdentifier || response.source() == ResourceResponse::Source::ServiceWorker) {
>-        m_networkProcess->downloadManager().startDownload(this, sessionID, downloadID, request);
>+        m_networkProcess->downloadManager().startDownload(sessionID, downloadID, request);
>         return;
>     }
> 
>Index: Source/WebKit/NetworkProcess/NetworkProcess.cpp
>===================================================================
>--- Source/WebKit/NetworkProcess/NetworkProcess.cpp	(revision 240984)
>+++ Source/WebKit/NetworkProcess/NetworkProcess.cpp	(working copy)
>@@ -1684,7 +1684,7 @@
> 
> void NetworkProcess::downloadRequest(PAL::SessionID sessionID, DownloadID downloadID, const ResourceRequest& request, const String& suggestedFilename)
> {
>-    downloadManager().startDownload(nullptr, sessionID, downloadID, request, suggestedFilename);
>+    downloadManager().startDownload(sessionID, downloadID, request, suggestedFilename);
> }
> 
> void NetworkProcess::resumeDownload(PAL::SessionID sessionID, DownloadID downloadID, const IPC::DataReference& resumeData, const String& path, WebKit::SandboxExtension::Handle&& sandboxExtensionHandle)
>Index: Source/WebKit/NetworkProcess/NetworkProcess.h
>===================================================================
>--- Source/WebKit/NetworkProcess/NetworkProcess.h	(revision 240984)
>+++ Source/WebKit/NetworkProcess/NetworkProcess.h	(working copy)
>@@ -292,7 +292,7 @@
>     void removeCacheEngine(const PAL::SessionID&);
>     void requestCacheStorageSpace(PAL::SessionID, const WebCore::ClientOrigin&, uint64_t quota, uint64_t currentSize, uint64_t spaceRequired, CompletionHandler<void(Optional<uint64_t>)>&&);
> 
>-    NetworkBlobRegistry& networkBlobRegistry() { return m_networkBlobRegistry; }
>+    NetworkBlobRegistry& networkBlobRegistry() override { return m_networkBlobRegistry; }
> 
> private:
>     void platformInitializeNetworkProcess(const NetworkProcessCreationParameters&);
>Index: Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>===================================================================
>--- Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp	(revision 240984)
>+++ Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp	(working copy)
>@@ -347,7 +347,7 @@
> {
>     // This can happen if the resource came from the disk cache.
>     if (!m_networkLoad) {
>-        m_connection->networkProcess().downloadManager().startDownload(m_connection.ptr(), m_parameters.sessionID, downloadID, request);
>+        m_connection->networkProcess().downloadManager().startDownload(m_parameters.sessionID, downloadID, request);
>         abort();
>         return;
>     }

Actions: View | Formatted Diff | Diff

Attachments on bug 194027: 360593 | 360598 | 360603 | 360787 | 360792 | 360805 | 360814 | 360893 | 360899 | 360920 | 360955 | 361199 | 361255 | 361257