Changeset 239701 in webkit

Timestamp:

Jan 7, 2019, 2:31:41 PM (6 years ago)

Author:

achristensen@apple.com

Message:

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

Reviewed by Megan Gardner.

Use a member Ref<NetworkProcess> instead to avoid global singleton use.

• NetworkProcess/NetworkConnectionToWebProcess.cpp:

(WebKit::NetworkConnectionToWebProcess::establishSWServerConnection):

• NetworkProcess/ServiceWorker/WebSWServerConnection.cpp:

(WebKit::WebSWServerConnection::WebSWServerConnection):
(WebKit::WebSWServerConnection::~WebSWServerConnection):
(WebKit::WebSWServerConnection::startFetch):
(WebKit::WebSWServerConnection::postMessageToServiceWorker):
(WebKit::WebSWServerConnection::scheduleJobInServer):

• NetworkProcess/ServiceWorker/WebSWServerConnection.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkConnectionToWebProcess.cpp (modified) (1 diff)
• NetworkProcess/ServiceWorker/WebSWServerConnection.cpp (modified) (4 diffs)
• NetworkProcess/ServiceWorker/WebSWServerConnection.h (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-01-07  Alex Christensen  <achristensen@webkit.org>
+
+        Remove use of NetworkProcess::singleton in ServiceWorker code
+        https://bugs.webkit.org/show_bug.cgi?id=193209
+
+        Reviewed by Megan Gardner.
+
+        Use a member Ref<NetworkProcess> instead to avoid global singleton use.
+
+        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+        (WebKit::NetworkConnectionToWebProcess::establishSWServerConnection):
+        * NetworkProcess/ServiceWorker/WebSWServerConnection.cpp:
+        (WebKit::WebSWServerConnection::WebSWServerConnection):
+        (WebKit::WebSWServerConnection::~WebSWServerConnection):
+        (WebKit::WebSWServerConnection::startFetch):
+        (WebKit::WebSWServerConnection::postMessageToServiceWorker):
+        (WebKit::WebSWServerConnection::scheduleJobInServer):
+        * NetworkProcess/ServiceWorker/WebSWServerConnection.h:
+
 2019-01-07  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp

@@ -728 +728 @@
 {
     auto& server = m_networkProcess->swServerForSession(sessionID);
-    auto connection = std::make_unique<WebSWServerConnection>(server, m_connection.get(), sessionID);
+    auto connection = std::make_unique<WebSWServerConnection>(m_networkProcess, server, m_connection.get(), sessionID);
     
     serverConnectionIdentifier = connection->identifier();

trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp

@@ -61 +61 @@
 #define SWSERVERCONNECTION_RELEASE_LOG_ERROR_IF_ALLOWED(fmt, ...) RELEASE_LOG_ERROR_IF(m_sessionID.isAlwaysOnLoggingAllowed(), ServiceWorker, "%p - WebSWServerConnection::" fmt, this, ##__VA_ARGS__)
 
-WebSWServerConnection::WebSWServerConnection(SWServer& server, IPC::Connection& connection, SessionID sessionID)
+WebSWServerConnection::WebSWServerConnection(NetworkProcess& networkProcess, SWServer& server, IPC::Connection& connection, SessionID sessionID)
     : SWServer::Connection(server)
     , m_sessionID(sessionID)
     , m_contentConnection(connection)
-{
-    NetworkProcess::singleton().registerSWServerConnection(*this);
+    , m_networkProcess(networkProcess)
+{
+    networkProcess.registerSWServerConnection(*this);
 }
 
 WebSWServerConnection::~WebSWServerConnection()
 {
-    NetworkProcess::singleton().unregisterSWServerConnection(*this);
+    m_networkProcess->unregisterSWServerConnection(*this);
     for (const auto& keyValue : m_clientOrigins)
         server().unregisterServiceWorkerClient(keyValue.value, keyValue.key);
@@ -166 +167 @@
 
         if (!worker->contextConnection())
-            NetworkProcess::singleton().createServerToContextConnection(worker->securityOrigin(), server().sessionID());
+            m_networkProcess->createServerToContextConnection(worker->securityOrigin(), server().sessionID());
 
         server().runServiceWorkerIfNecessary(serviceWorkerIdentifier, [weakThis = WTFMove(weakThis), this, fetchIdentifier, serviceWorkerIdentifier, request = WTFMove(request), options = WTFMove(options), formData = WTFMove(formData), referrer = WTFMove(referrer)](auto* contextConnection) {
@@ -209 +210 @@
 
     if (!destinationWorker->contextConnection())
-        NetworkProcess::singleton().createServerToContextConnection(destinationWorker->securityOrigin(), server().sessionID());
+        m_networkProcess->createServerToContextConnection(destinationWorker->securityOrigin(), server().sessionID());
 
     // It's possible this specific worker cannot be re-run (e.g. its registration has been removed)
@@ -221 +222 @@
 {
     auto securityOrigin = SecurityOriginData::fromURL(jobData.scriptURL);
-    if (!NetworkProcess::singleton().serverToContextConnectionForOrigin(securityOrigin))
-        NetworkProcess::singleton().createServerToContextConnection(securityOrigin, server().sessionID());
+    if (!m_networkProcess->serverToContextConnectionForOrigin(securityOrigin))
+        m_networkProcess->createServerToContextConnection(securityOrigin, server().sessionID());
 
     SWSERVERCONNECTION_RELEASE_LOG_IF_ALLOWED("Scheduling ServiceWorker job %s in server", jobData.identifier().loggingString().utf8().data());

trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.h

@@ -49 +49 @@
 namespace WebKit {
 
+class NetworkProcess;
+
 class WebSWServerConnection : public WebCore::SWServer::Connection, public IPC::MessageSender, public IPC::MessageReceiver {
 public:
-    WebSWServerConnection(WebCore::SWServer&, IPC::Connection&, PAL::SessionID);
+    WebSWServerConnection(NetworkProcess&, WebCore::SWServer&, IPC::Connection&, PAL::SessionID);
     WebSWServerConnection(const WebSWServerConnection&) = delete;
     ~WebSWServerConnection() final;
@@ -104 +106 @@
     PAL::SessionID m_sessionID;
     Ref<IPC::Connection> m_contentConnection;
+    Ref<NetworkProcess> m_networkProcess;
     HashMap<WebCore::ServiceWorkerClientIdentifier, WebCore::ClientOrigin> m_clientOrigins;
 };