Changeset 239699 in webkit

Timestamp:

Jan 7, 2019 2:29:22 PM (5 years ago)

Author:

achristensen@apple.com

Message:

Remove use of NetworkProcess::singleton for downloads
​https://bugs.webkit.org/show_bug.cgi?id=193207

Reviewed by Brady Eidson.

No change in behavior. The DownloadManager is now a member of the NetworkProcess instead of a static singleton.

• NetworkProcess/Downloads/Download.cpp:

(WebKit::Download::Download):
(WebKit::Download::didReceiveChallenge):

• NetworkProcess/Downloads/Download.h:
• NetworkProcess/Downloads/DownloadManager.cpp:

(WebKit::DownloadManager::startDownload):
(WebKit::DownloadManager::convertNetworkLoadToDownload):

• NetworkProcess/Downloads/DownloadManager.h:

(WebKit::DownloadManager::client):

• NetworkProcess/Downloads/PendingDownload.cpp:

(WebKit::PendingDownload::PendingDownload):
(WebKit::PendingDownload::messageSenderConnection):

• NetworkProcess/Downloads/PendingDownload.h:
• NetworkProcess/NetworkLoadChecker.cpp:
• NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::NetworkProcess):
(WebKit::NetworkProcess::downloadManager):

• NetworkProcess/NetworkProcess.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/Downloads/Download.cpp (modified) (3 diffs)
• NetworkProcess/Downloads/Download.h (modified) (3 diffs)
• NetworkProcess/Downloads/DownloadManager.cpp (modified) (2 diffs)
• NetworkProcess/Downloads/DownloadManager.h (modified) (2 diffs)
• NetworkProcess/Downloads/PendingDownload.cpp (modified) (3 diffs)
• NetworkProcess/Downloads/PendingDownload.h (modified) (3 diffs)
• NetworkProcess/NetworkLoadChecker.cpp (modified) (1 diff)
• NetworkProcess/NetworkProcess.cpp (modified) (2 diffs)
• NetworkProcess/NetworkProcess.h (modified) (4 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-01-07  Alex Christensen  <achristensen@webkit.org>
+
+        Remove use of NetworkProcess::singleton for downloads
+        https://bugs.webkit.org/show_bug.cgi?id=193207
+
+        Reviewed by Brady Eidson.
+
+        No change in behavior.  The DownloadManager is now a member of the NetworkProcess instead of a static singleton.
+
+        * NetworkProcess/Downloads/Download.cpp:
+        (WebKit::Download::Download):
+        (WebKit::Download::didReceiveChallenge):
+        * NetworkProcess/Downloads/Download.h:
+        * NetworkProcess/Downloads/DownloadManager.cpp:
+        (WebKit::DownloadManager::startDownload):
+        (WebKit::DownloadManager::convertNetworkLoadToDownload):
+        * NetworkProcess/Downloads/DownloadManager.h:
+        (WebKit::DownloadManager::client):
+        * NetworkProcess/Downloads/PendingDownload.cpp:
+        (WebKit::PendingDownload::PendingDownload):
+        (WebKit::PendingDownload::messageSenderConnection):
+        * NetworkProcess/Downloads/PendingDownload.h:
+        * NetworkProcess/NetworkLoadChecker.cpp:
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::NetworkProcess):
+        (WebKit::NetworkProcess::downloadManager):
+        * NetworkProcess/NetworkProcess.h:
+
 2019-01-07  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebKit/NetworkProcess/Downloads/Download.cpp

@@ -53 +53 @@
     : m_downloadManager(downloadManager)
     , m_downloadID(downloadID)
+    , m_client(downloadManager.client())
     , m_download(&download)
     , m_sessionID(sessionID)
@@ -66 +67 @@
     : m_downloadManager(downloadManager)
     , m_downloadID(downloadID)
+    , m_client(downloadManager.client())
     , m_downloadTask(download)
     , m_sessionID(sessionID)
@@ -99 +101 @@
     }
 
-    NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(*this, challenge, WTFMove(completionHandler));
+    m_client->downloadsAuthenticationManager().didReceiveAuthenticationChallenge(*this, challenge, WTFMove(completionHandler));
 }
 

trunk/Source/WebKit/NetworkProcess/Downloads/Download.h

@@ -27 +27 @@
 
 #include "DownloadID.h"
+#include "DownloadManager.h"
 #include "MessageSender.h"
 #include "NetworkDataTask.h"
@@ -58 +59 @@
 namespace WebKit {
 
-class DownloadManager;
 class NetworkDataTask;
 class NetworkSession;
@@ -102 +102 @@
     DownloadManager& m_downloadManager;
     DownloadID m_downloadID;
+    Ref<DownloadManager::Client> m_client;
 
     Vector<RefPtr<WebCore::BlobDataFileReference>> m_blobFileReferences;

trunk/Source/WebKit/NetworkProcess/Downloads/DownloadManager.cpp

@@ -59 +59 @@
     parameters.storedCredentialsPolicy = sessionID.isEphemeral() ? StoredCredentialsPolicy::DoNotUse : StoredCredentialsPolicy::Use;
 
-    m_pendingDownloads.add(downloadID, std::make_unique<PendingDownload>(WTFMove(parameters), downloadID, *networkSession, suggestedName));
+    m_pendingDownloads.add(downloadID, std::make_unique<PendingDownload>(m_client.parentProcessConnectionForDownloads(), WTFMove(parameters), downloadID, *networkSession, suggestedName));
 }
 
@@ -93 +93 @@
 {
     ASSERT(!m_pendingDownloads.contains(downloadID));
-    m_pendingDownloads.add(downloadID, std::make_unique<PendingDownload>(WTFMove(networkLoad), WTFMove(completionHandler), downloadID, request, response));
+    m_pendingDownloads.add(downloadID, std::make_unique<PendingDownload>(m_client.parentProcessConnectionForDownloads(), WTFMove(networkLoad), WTFMove(completionHandler), downloadID, request, response));
 }
 

trunk/Source/WebKit/NetworkProcess/Downloads/DownloadManager.h

@@ -70 +70 @@
         virtual void didDestroyDownload() = 0;
         virtual IPC::Connection* downloadProxyConnection() = 0;
+        virtual IPC::Connection* parentProcessConnectionForDownloads() = 0;
         virtual AuthenticationManager& downloadsAuthenticationManager() = 0;
         virtual void pendingDownloadCanceled(DownloadID) = 0;
+        virtual void ref() const = 0;
+        virtual void deref() const = 0;
     };
 
@@ -101 +104 @@
     IPC::Connection* downloadProxyConnection();
     AuthenticationManager& downloadsAuthenticationManager();
+    
+    Client& client() { return m_client; }
 
 private:

trunk/Source/WebKit/NetworkProcess/Downloads/PendingDownload.cpp

@@ -36 +36 @@
 using namespace WebCore;
 
-PendingDownload::PendingDownload(NetworkLoadParameters&& parameters, DownloadID downloadID, NetworkSession& networkSession, const String& suggestedName)
+PendingDownload::PendingDownload(IPC::Connection* parentProcessConnection, NetworkLoadParameters&& parameters, DownloadID downloadID, NetworkSession& networkSession, const String& suggestedName)
     : m_networkLoad(std::make_unique<NetworkLoad>(*this, WTFMove(parameters), networkSession))
+    , m_parentProcessConnection(parentProcessConnection)
 {
     m_isAllowedToAskUserForCredentials = parameters.clientCredentialPolicy == ClientCredentialPolicy::MayAskClientForCredentials;
@@ -48 +49 @@
 }
 
-PendingDownload::PendingDownload(std::unique_ptr<NetworkLoad>&& networkLoad, ResponseCompletionHandler&& completionHandler, DownloadID downloadID, const ResourceRequest& request, const ResourceResponse& response)
+PendingDownload::PendingDownload(IPC::Connection* parentProcessConnection, std::unique_ptr<NetworkLoad>&& networkLoad, ResponseCompletionHandler&& completionHandler, DownloadID downloadID, const ResourceRequest& request, const ResourceResponse& response)
     : m_networkLoad(WTFMove(networkLoad))
+    , m_parentProcessConnection(parentProcessConnection)
 {
     m_isAllowedToAskUserForCredentials = m_networkLoad->isAllowedToAskUserForCredentials();
@@ -98 +100 @@
 IPC::Connection* PendingDownload::messageSenderConnection()
 {
-    return NetworkProcess::singleton().parentProcessConnection();
+    return m_parentProcessConnection.get();
 }
 

trunk/Source/WebKit/NetworkProcess/Downloads/PendingDownload.h

@@ -29 +29 @@
 #include "NetworkLoadClient.h"
 
+namespace IPC {
+class Connection;
+}
+
 namespace WebCore {
 class ResourceResponse;
@@ -44 +48 @@
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    PendingDownload(NetworkLoadParameters&&, DownloadID, NetworkSession&, const String& suggestedName);
-    PendingDownload(std::unique_ptr<NetworkLoad>&&, ResponseCompletionHandler&&, DownloadID, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
+    PendingDownload(IPC::Connection*, NetworkLoadParameters&&, DownloadID, NetworkSession&, const String& suggestedName);
+    PendingDownload(IPC::Connection*, std::unique_ptr<NetworkLoad>&&, ResponseCompletionHandler&&, DownloadID, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
 
     void continueWillSendRequest(WebCore::ResourceRequest&&);
@@ -72 +76 @@
 private:
     std::unique_ptr<NetworkLoad> m_networkLoad;
+    RefPtr<IPC::Connection> m_parentProcessConnection;
     bool m_isAllowedToAskUserForCredentials;
 

trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp

@@ -27 +27 @@
 #include "NetworkLoadChecker.h"
 
+#include "Download.h"
 #include "Logging.h"
 #include "NetworkCORSPreflightChecker.h"

trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

@@ -125 +125 @@
     , m_diskCacheIsDisabledForTesting(false)
     , m_canHandleHTTPSServerTrustEvaluation(true)
+    , m_downloadManager(*this)
 #if PLATFORM(COCOA)
     , m_clearCacheDispatchGroup(0)
@@ -166 +167 @@
 DownloadManager& NetworkProcess::downloadManager()
 {
-    static NeverDestroyed<DownloadManager> downloadManager(*this);
-    return downloadManager;
+    return m_downloadManager;
 }
 

trunk/Source/WebKit/NetworkProcess/NetworkProcess.h

@@ -95 +95 @@
 {
     WTF_MAKE_NONCOPYABLE(NetworkProcess);
-    friend NeverDestroyed<DownloadManager>;
 public:
     ~NetworkProcess();
@@ -212 +211 @@
     const String& uiProcessBundleIdentifier() const { return m_uiProcessBundleIdentifier; }
 
+    void ref() const override { ThreadSafeRefCounted<NetworkProcess>::ref(); }
+    void deref() const override { ThreadSafeRefCounted<NetworkProcess>::deref(); }
+    
 private:
     NetworkProcess();
@@ -248 +250 @@
     void didDestroyDownload() override;
     IPC::Connection* downloadProxyConnection() override;
+    IPC::Connection* parentProcessConnectionForDownloads() override { return parentProcessConnection(); }
     AuthenticationManager& downloadsAuthenticationManager() override;
     void pendingDownloadCanceled(DownloadID) override;
@@ -355 +358 @@
     bool m_canHandleHTTPSServerTrustEvaluation;
     String m_uiProcessBundleIdentifier;
+    DownloadManager m_downloadManager;
 
     RefPtr<NetworkCache::Cache> m_cache;