Attachment 358529 Details for Bug 193212 – Patch

[patch] Patch

bug-193212-20190107140327.patch (text/plain), 7.46 KB, created by Alex Christensen on 2019-01-07 14:03:27 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-01-07 14:03:27 PST

Size: 7.46 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 239695)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,24 @@
>+2019-01-07  Alex Christensen  <achristensen@webkit.org>
>+
>+        Remove use of NetworkProcess::singleton in NetworkLoad/NetworkDataTask code
>+        https://bugs.webkit.org/show_bug.cgi?id=193212
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/NetworkDataTaskBlob.cpp:
>+        (WebKit::NetworkDataTaskBlob::NetworkDataTaskBlob):
>+        (WebKit::NetworkDataTaskBlob::download):
>+        (WebKit::NetworkDataTaskBlob::writeDownload):
>+        (WebKit::NetworkDataTaskBlob::didFailDownload):
>+        (WebKit::NetworkDataTaskBlob::didFinishDownload):
>+        * NetworkProcess/NetworkDataTaskBlob.h:
>+        * NetworkProcess/NetworkLoad.cpp:
>+        (WebKit::NetworkLoad::NetworkLoad):
>+        (WebKit::NetworkLoad::convertTaskToDownload):
>+        (WebKit::NetworkLoad::didReceiveChallenge):
>+        (WebKit::NetworkLoad::didReceiveResponse):
>+        * NetworkProcess/NetworkLoad.h:
>+
> 2019-01-07  Eric Carlson  <eric.carlson@apple.com>
> 
>         Deactivate audio session whenever possible
>Index: Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp
>===================================================================
>--- Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp	(revision 239670)
>+++ Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp	(working copy)
>@@ -69,6 +69,7 @@ NetworkDataTaskBlob::NetworkDataTaskBlob
>     : NetworkDataTask(session, client, request, StoredCredentialsPolicy::DoNotUse, false, false)
>     , m_stream(std::make_unique<AsyncFileStream>(*this))
>     , m_fileReferences(fileReferences)
>+    , m_networkProcess(session.networkProcess())
> {
>     for (auto& fileReference : m_fileReferences)
>         fileReference->prepareForFileAccess();
>@@ -465,7 +466,7 @@ void NetworkDataTaskBlob::download()
>         return;
>     }
> 
>-    auto& downloadManager = NetworkProcess::singleton().downloadManager();
>+    auto& downloadManager = m_networkProcess->downloadManager();
>     auto download = std::make_unique<Download>(downloadManager, m_pendingDownloadID, *this, m_session->sessionID(), suggestedFilename());
>     auto* downloadPtr = download.get();
>     downloadManager.dataTaskBecameDownloadTask(m_pendingDownloadID, WTFMove(download));
>@@ -487,7 +488,7 @@ bool NetworkDataTaskBlob::writeDownload(
>     }
> 
>     ASSERT(bytesWritten == bytesRead);
>-    auto* download = NetworkProcess::singleton().downloadManager().download(m_pendingDownloadID);
>+    auto* download = m_networkProcess->downloadManager().download(m_pendingDownloadID);
>     ASSERT(download);
>     download->didReceiveData(bytesWritten);
>     return true;
>@@ -517,7 +518,7 @@ void NetworkDataTaskBlob::didFailDownloa
>     if (m_client)
>         m_client->didCompleteWithError(error);
>     else {
>-        auto* download = NetworkProcess::singleton().downloadManager().download(m_pendingDownloadID);
>+        auto* download = m_networkProcess->downloadManager().download(m_pendingDownloadID);
>         ASSERT(download);
>         download->didFail(error, IPC::DataReference());
>     }
>@@ -537,7 +538,7 @@ void NetworkDataTaskBlob::didFinishDownl
>     }
> 
>     clearStream();
>-    auto* download = NetworkProcess::singleton().downloadManager().download(m_pendingDownloadID);
>+    auto* download = m_networkProcess->downloadManager().download(m_pendingDownloadID);
>     ASSERT(download);
>     download->didFinish();
> }
>Index: Source/WebKit/NetworkProcess/NetworkDataTaskBlob.h
>===================================================================
>--- Source/WebKit/NetworkProcess/NetworkDataTaskBlob.h	(revision 239670)
>+++ Source/WebKit/NetworkProcess/NetworkDataTaskBlob.h	(working copy)
>@@ -44,6 +44,8 @@ class BlobDataItem;
> 
> namespace WebKit {
> 
>+class NetworkProcess;
>+
> class NetworkDataTaskBlob final : public NetworkDataTask, public WebCore::FileStreamClient {
> public:
>     static Ref<NetworkDataTask> create(NetworkSession& session, NetworkDataTaskClient& client, const WebCore::ResourceRequest& request, WebCore::ContentSniffingPolicy shouldContentSniff, const Vector<RefPtr<WebCore::BlobDataFileReference>>& fileReferences)
>@@ -115,6 +117,7 @@ private:
> 
>     Vector<RefPtr<WebCore::BlobDataFileReference>> m_fileReferences;
>     RefPtr<SandboxExtension> m_sandboxExtension;
>+    Ref<NetworkProcess> m_networkProcess;
> };
> 
> } // namespace WebKit
>Index: Source/WebKit/NetworkProcess/NetworkLoad.cpp
>===================================================================
>--- Source/WebKit/NetworkProcess/NetworkLoad.cpp	(revision 239670)
>+++ Source/WebKit/NetworkProcess/NetworkLoad.cpp	(working copy)
>@@ -52,6 +52,7 @@ struct NetworkLoad::Throttle {
> 
> NetworkLoad::NetworkLoad(NetworkLoadClient& client, NetworkLoadParameters&& parameters, NetworkSession& networkSession)
>     : m_client(client)
>+    , m_networkProcess(networkSession.networkProcess())
>     , m_parameters(WTFMove(parameters))
>     , m_loadThrottleLatency(networkSession.loadThrottleLatency())
>     , m_currentRequest(m_parameters.request)
>@@ -133,7 +134,7 @@ void NetworkLoad::convertTaskToDownload(
>     m_currentRequest = updatedRequest;
>     m_task->setPendingDownload(pendingDownload);
>     
>-    NetworkProcess::singleton().findPendingDownloadLocation(*m_task.get(), WTFMove(completionHandler), response);
>+    m_networkProcess->findPendingDownloadLocation(*m_task.get(), WTFMove(completionHandler), response);
> }
> 
> void NetworkLoad::setPendingDownloadID(DownloadID downloadID)
>@@ -188,9 +189,9 @@ void NetworkLoad::didReceiveChallenge(Au
>     }
>     
>     if (auto* pendingDownload = m_task->pendingDownload())
>-        NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(*pendingDownload, challenge, WTFMove(completionHandler));
>+        m_networkProcess->authenticationManager().didReceiveAuthenticationChallenge(*pendingDownload, challenge, WTFMove(completionHandler));
>     else
>-        NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(m_parameters.webPageID, m_parameters.webFrameID, challenge, WTFMove(completionHandler));
>+        m_networkProcess->authenticationManager().didReceiveAuthenticationChallenge(m_parameters.webPageID, m_parameters.webFrameID, challenge, WTFMove(completionHandler));
> }
> 
> void NetworkLoad::didReceiveResponse(ResourceResponse&& response, ResponseCompletionHandler&& completionHandler)
>@@ -199,7 +200,7 @@ void NetworkLoad::didReceiveResponse(Res
>     ASSERT(!m_throttle);
> 
>     if (m_task && m_task->isDownload()) {
>-        NetworkProcess::singleton().findPendingDownloadLocation(*m_task.get(), WTFMove(completionHandler), response);
>+        m_networkProcess->findPendingDownloadLocation(*m_task.get(), WTFMove(completionHandler), response);
>         return;
>     }
> 
>Index: Source/WebKit/NetworkProcess/NetworkLoad.h
>===================================================================
>--- Source/WebKit/NetworkProcess/NetworkLoad.h	(revision 239670)
>+++ Source/WebKit/NetworkProcess/NetworkLoad.h	(working copy)
>@@ -35,6 +35,8 @@
> 
> namespace WebKit {
> 
>+class NetworkProcess;
>+
> class NetworkLoad final : private NetworkDataTaskClient {
>     WTF_MAKE_FAST_ALLOCATED;
> public:
>@@ -79,6 +81,7 @@ private:
>     void throttleDelayCompleted();
> 
>     std::reference_wrapper<NetworkLoadClient> m_client;
>+    Ref<NetworkProcess> m_networkProcess;
>     const NetworkLoadParameters m_parameters;
>     CompletionHandler<void(WebCore::ResourceRequest&&)> m_redirectCompletionHandler;
>     RefPtr<NetworkDataTask> m_task;

Flags:

aestes: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 193212: 358529