Changeset 239700 in webkit

Timestamp:

Jan 7, 2019 2:30:05 PM (5 years ago)

Author:

achristensen@apple.com

Message:

Remove use of NetworkProcess::singleton in NetworkLoad/NetworkDataTask code
​https://bugs.webkit.org/show_bug.cgi?id=193212

Reviewed by Andy Estes.

• 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:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkDataTaskBlob.cpp (modified) (5 diffs)
• NetworkProcess/NetworkDataTaskBlob.h (modified) (2 diffs)
• NetworkProcess/NetworkLoad.cpp (modified) (4 diffs)
• NetworkProcess/NetworkLoad.h (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+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 Andy Estes.
+
+        * 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  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp

@@ -70 +70 @@
     , m_stream(std::make_unique<AsyncFileStream>(*this))
     , m_fileReferences(fileReferences)
+    , m_networkProcess(session.networkProcess())
 {
     for (auto& fileReference : m_fileReferences)
@@ -466 +467 @@
     }
 
-    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();
@@ -488 +489 @@
 
     ASSERT(bytesWritten == bytesRead);
-    auto* download = NetworkProcess::singleton().downloadManager().download(m_pendingDownloadID);
+    auto* download = m_networkProcess->downloadManager().download(m_pendingDownloadID);
     ASSERT(download);
     download->didReceiveData(bytesWritten);
@@ -518 +519 @@
         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());
@@ -538 +539 @@
 
     clearStream();
-    auto* download = NetworkProcess::singleton().downloadManager().download(m_pendingDownloadID);
+    auto* download = m_networkProcess->downloadManager().download(m_pendingDownloadID);
     ASSERT(download);
     download->didFinish();

trunk/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.h

@@ -44 +44 @@
 
 namespace WebKit {
+
+class NetworkProcess;
 
 class NetworkDataTaskBlob final : public NetworkDataTask, public WebCore::FileStreamClient {
@@ -116 +118 @@
     Vector<RefPtr<WebCore::BlobDataFileReference>> m_fileReferences;
     RefPtr<SandboxExtension> m_sandboxExtension;
+    Ref<NetworkProcess> m_networkProcess;
 };
 

trunk/Source/WebKit/NetworkProcess/NetworkLoad.cpp

@@ -53 +53 @@
 NetworkLoad::NetworkLoad(NetworkLoadClient& client, NetworkLoadParameters&& parameters, NetworkSession& networkSession)
     : m_client(client)
+    , m_networkProcess(networkSession.networkProcess())
     , m_parameters(WTFMove(parameters))
     , m_loadThrottleLatency(networkSession.loadThrottleLatency())
@@ -134 +135 @@
     m_task->setPendingDownload(pendingDownload);
     
-    NetworkProcess::singleton().findPendingDownloadLocation(*m_task.get(), WTFMove(completionHandler), response);
+    m_networkProcess->findPendingDownloadLocation(*m_task.get(), WTFMove(completionHandler), response);
 }
 
@@ -189 +190 @@
     
     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));
 }
 
@@ -200 +201 @@
 
     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;
     }

trunk/Source/WebKit/NetworkProcess/NetworkLoad.h

@@ -35 +35 @@
 
 namespace WebKit {
+
+class NetworkProcess;
 
 class NetworkLoad final : private NetworkDataTaskClient {
@@ -80 +82 @@
 
     std::reference_wrapper<NetworkLoadClient> m_client;
+    Ref<NetworkProcess> m_networkProcess;
     const NetworkLoadParameters m_parameters;
     CompletionHandler<void(WebCore::ResourceRequest&&)> m_redirectCompletionHandler;