Diff
Modified: trunk/Source/WebKit/ChangeLog (288934 => 288935)
--- trunk/Source/WebKit/ChangeLog 2022-02-02 02:02:01 UTC (rev 288934)
+++ trunk/Source/WebKit/ChangeLog 2022-02-02 02:08:23 UTC (rev 288935)
@@ -1,3 +1,36 @@
+2022-02-01 Chris Dumez <[email protected]>
+
+ Rename some service worker functions that have names that are too generic
+ https://bugs.webkit.org/show_bug.cgi?id=235988
+
+ Reviewed by Darin Adler.
+
+ Rename some service worker functions that have names that are too generic and will cause
+ confusion with shared workers.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::serverToContextConnectionNoLongerNeeded):
+ * NetworkProcess/NetworkSession.cpp:
+ (WebKit::NetworkSession::ensureSWServer):
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::establishServiceWorkerContextConnectionToNetworkProcess):
+ (WebKit::NetworkProcessProxy::serviceWorkerContextConnectionNoLongerNeeded):
+ (WebKit::NetworkProcessProxy::establishWorkerContextConnectionToNetworkProcess): Deleted.
+ (WebKit::NetworkProcessProxy::workerContextConnectionNoLongerNeeded): Deleted.
+ * UIProcess/Network/NetworkProcessProxy.h:
+ * UIProcess/Network/NetworkProcessProxy.messages.in:
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::establishServiceWorkerContextConnectionToNetworkProcess):
+ (WebKit::WebProcessPool::establishWorkerContextConnectionToNetworkProcess): Deleted.
+ * UIProcess/WebProcessPool.h:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::establishServiceWorkerContext):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::establishServiceWorkerContextConnectionToNetworkProcess):
+ (WebKit::WebProcess::establishWorkerContextConnectionToNetworkProcess): Deleted.
+ * WebProcess/WebProcess.h:
+ * WebProcess/WebProcess.messages.in:
+
2022-02-01 Wenson Hsieh <[email protected]>
The default values for a couple of Live Text-related features should respect system feature flags
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (288934 => 288935)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2022-02-02 02:02:01 UTC (rev 288934)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2022-02-02 02:08:23 UTC (rev 288935)
@@ -1226,7 +1226,7 @@
void NetworkConnectionToWebProcess::serverToContextConnectionNoLongerNeeded()
{
CONNECTION_RELEASE_LOG(ServiceWorker, "serverToContextConnectionNoLongerNeeded: WebProcess no longer useful for running service workers");
- m_networkProcess->parentProcessConnection()->send(Messages::NetworkProcessProxy::WorkerContextConnectionNoLongerNeeded { webProcessIdentifier() }, 0);
+ m_networkProcess->parentProcessConnection()->send(Messages::NetworkProcessProxy::ServiceWorkerContextConnectionNoLongerNeeded { webProcessIdentifier() }, 0);
m_swContextConnection = nullptr;
}
Modified: trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp (288934 => 288935)
--- trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp 2022-02-02 02:02:01 UTC (rev 288934)
+++ trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp 2022-02-02 02:08:23 UTC (rev 288935)
@@ -629,7 +629,7 @@
ServiceWorkerSoftUpdateLoader::start(this, WTFMove(jobData), shouldRefreshCache, WTFMove(request), WTFMove(completionHandler));
}, [this](auto& registrableDomain, std::optional<ScriptExecutionContextIdentifier> serviceWorkerPageIdentifier, auto&& completionHandler) {
ASSERT(!registrableDomain.isEmpty());
- m_networkProcess->parentProcessConnection()->sendWithAsyncReply(Messages::NetworkProcessProxy::EstablishWorkerContextConnectionToNetworkProcess { registrableDomain, serviceWorkerPageIdentifier, m_sessionID }, WTFMove(completionHandler), 0);
+ m_networkProcess->parentProcessConnection()->sendWithAsyncReply(Messages::NetworkProcessProxy::EstablishServiceWorkerContextConnectionToNetworkProcess { registrableDomain, serviceWorkerPageIdentifier, m_sessionID }, WTFMove(completionHandler), 0);
}, WTFMove(appBoundDomainsCallback));
}
return *m_swServer;
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp (288934 => 288935)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2022-02-02 02:02:01 UTC (rev 288934)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2022-02-02 02:08:23 UTC (rev 288935)
@@ -1416,12 +1416,12 @@
#endif
#if ENABLE(SERVICE_WORKER)
-void NetworkProcessProxy::establishWorkerContextConnectionToNetworkProcess(RegistrableDomain&& registrableDomain, std::optional<ScriptExecutionContextIdentifier> serviceWorkerPageIdentifier, PAL::SessionID sessionID, CompletionHandler<void()>&& completionHandler)
+void NetworkProcessProxy::establishServiceWorkerContextConnectionToNetworkProcess(RegistrableDomain&& registrableDomain, std::optional<ScriptExecutionContextIdentifier> serviceWorkerPageIdentifier, PAL::SessionID sessionID, CompletionHandler<void()>&& completionHandler)
{
- WebProcessPool::establishWorkerContextConnectionToNetworkProcess(*this, WTFMove(registrableDomain), serviceWorkerPageIdentifier, sessionID, WTFMove(completionHandler));
+ WebProcessPool::establishServiceWorkerContextConnectionToNetworkProcess(*this, WTFMove(registrableDomain), serviceWorkerPageIdentifier, sessionID, WTFMove(completionHandler));
}
-void NetworkProcessProxy::workerContextConnectionNoLongerNeeded(WebCore::ProcessIdentifier identifier)
+void NetworkProcessProxy::serviceWorkerContextConnectionNoLongerNeeded(WebCore::ProcessIdentifier identifier)
{
if (auto* process = WebProcessProxy::processForIdentifier(identifier))
process->disableServiceWorkers();
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h (288934 => 288935)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h 2022-02-02 02:02:01 UTC (rev 288934)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h 2022-02-02 02:08:23 UTC (rev 288935)
@@ -327,8 +327,8 @@
#endif
#if ENABLE(SERVICE_WORKER)
- void establishWorkerContextConnectionToNetworkProcess(WebCore::RegistrableDomain&&, std::optional<WebCore::ScriptExecutionContextIdentifier> serviceWorkerPageIdentifier, PAL::SessionID, CompletionHandler<void()>&&);
- void workerContextConnectionNoLongerNeeded(WebCore::ProcessIdentifier);
+ void establishServiceWorkerContextConnectionToNetworkProcess(WebCore::RegistrableDomain&&, std::optional<WebCore::ScriptExecutionContextIdentifier> serviceWorkerPageIdentifier, PAL::SessionID, CompletionHandler<void()>&&);
+ void serviceWorkerContextConnectionNoLongerNeeded(WebCore::ProcessIdentifier);
void registerServiceWorkerClientProcess(WebCore::ProcessIdentifier webProcessIdentifier, WebCore::ProcessIdentifier serviceWorkerProcessIdentifier);
void unregisterServiceWorkerClientProcess(WebCore::ProcessIdentifier webProcessIdentifier, WebCore::ProcessIdentifier serviceWorkerProcessIdentifier);
void startServiceWorkerBackgroundProcessing(WebCore::ProcessIdentifier serviceWorkerProcessIdentifier);
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.messages.in (288934 => 288935)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.messages.in 2022-02-02 02:02:01 UTC (rev 288934)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.messages.in 2022-02-02 02:08:23 UTC (rev 288935)
@@ -53,8 +53,8 @@
TerminateWebProcess(WebCore::ProcessIdentifier webProcessIdentifier)
#if ENABLE(SERVICE_WORKER)
- EstablishWorkerContextConnectionToNetworkProcess(WebCore::RegistrableDomain registrableDomain, std::optional<WebCore::ScriptExecutionContextIdentifier> serviceWorkerPageIdentifier, PAL::SessionID sessionID) -> () Async
- WorkerContextConnectionNoLongerNeeded(WebCore::ProcessIdentifier identifier)
+ EstablishServiceWorkerContextConnectionToNetworkProcess(WebCore::RegistrableDomain registrableDomain, std::optional<WebCore::ScriptExecutionContextIdentifier> serviceWorkerPageIdentifier, PAL::SessionID sessionID) -> () Async
+ ServiceWorkerContextConnectionNoLongerNeeded(WebCore::ProcessIdentifier identifier)
RegisterServiceWorkerClientProcess(WebCore::ProcessIdentifier webProcessIdentifier, WebCore::ProcessIdentifier serviceWorkerProcessIdentifier)
UnregisterServiceWorkerClientProcess(WebCore::ProcessIdentifier webProcessIdentifier, WebCore::ProcessIdentifier serviceWorkerProcessIdentifier)
StartServiceWorkerBackgroundProcessing(WebCore::ProcessIdentifier serviceWorkerProcessIdentifier)
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (288934 => 288935)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2022-02-02 02:02:01 UTC (rev 288934)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2022-02-02 02:08:23 UTC (rev 288935)
@@ -529,7 +529,7 @@
bool WebProcessPool::s_useSeparateServiceWorkerProcess = false;
#if ENABLE(SERVICE_WORKER)
-void WebProcessPool::establishWorkerContextConnectionToNetworkProcess(NetworkProcessProxy& proxy, RegistrableDomain&& registrableDomain, std::optional<ScriptExecutionContextIdentifier> serviceWorkerPageIdentifier, PAL::SessionID sessionID, CompletionHandler<void()>&& completionHandler)
+void WebProcessPool::establishServiceWorkerContextConnectionToNetworkProcess(NetworkProcessProxy& proxy, RegistrableDomain&& registrableDomain, std::optional<ScriptExecutionContextIdentifier> serviceWorkerPageIdentifier, PAL::SessionID sessionID, CompletionHandler<void()>&& completionHandler)
{
auto* websiteDataStore = WebsiteDataStore::existingDataStoreForSessionID(sessionID);
if (!websiteDataStore)
@@ -571,7 +571,7 @@
ASSERT(!serviceWorkerProcessProxy->isInProcessCache());
}
- WEBPROCESSPOOL_RELEASE_LOG_STATIC(ServiceWorker, "establishWorkerContextConnectionToNetworkProcess reusing an existing web process (process=%p, PID=%d)", serviceWorkerProcessProxy, serviceWorkerProcessProxy->processIdentifier());
+ WEBPROCESSPOOL_RELEASE_LOG_STATIC(ServiceWorker, "establishServiceWorkerContextConnectionToNetworkProcess reusing an existing web process (process=%p, PID=%d)", serviceWorkerProcessProxy, serviceWorkerProcessProxy->processIdentifier());
break;
}
}
@@ -580,7 +580,7 @@
auto newProcessProxy = WebProcessProxy::createForServiceWorkers(*processPool, RegistrableDomain { registrableDomain }, *websiteDataStore);
serviceWorkerProcessProxy = newProcessProxy.ptr();
- WEBPROCESSPOOL_RELEASE_LOG_STATIC(ServiceWorker, "establishWorkerContextConnectionToNetworkProcess creating a new service worker process (proces=%p, PID=%d)", serviceWorkerProcessProxy, serviceWorkerProcessProxy->processIdentifier());
+ WEBPROCESSPOOL_RELEASE_LOG_STATIC(ServiceWorker, "establishServiceWorkerContextConnectionToNetworkProcess creating a new service worker process (proces=%p, PID=%d)", serviceWorkerProcessProxy, serviceWorkerProcessProxy->processIdentifier());
processPool->initializeNewWebProcess(newProcessProxy, websiteDataStore);
processPool->m_processes.append(WTFMove(newProcessProxy));
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.h (288934 => 288935)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.h 2022-02-02 02:02:01 UTC (rev 288934)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.h 2022-02-02 02:08:23 UTC (rev 288935)
@@ -375,7 +375,7 @@
bool isServiceWorkerPageID(WebPageProxyIdentifier) const;
#if ENABLE(SERVICE_WORKER)
- static void establishWorkerContextConnectionToNetworkProcess(NetworkProcessProxy&, WebCore::RegistrableDomain&&, std::optional<WebCore::ScriptExecutionContextIdentifier> serviceWorkerPageIdentifier, PAL::SessionID, CompletionHandler<void()>&&);
+ static void establishServiceWorkerContextConnectionToNetworkProcess(NetworkProcessProxy&, WebCore::RegistrableDomain&&, std::optional<WebCore::ScriptExecutionContextIdentifier> serviceWorkerPageIdentifier, PAL::SessionID, CompletionHandler<void()>&&);
void removeFromServiceWorkerProcesses(WebProcessProxy&);
size_t serviceWorkerProxiesCount() const { return serviceWorkerProcesses().computeSize(); }
void updateServiceWorkerUserAgent(const String& userAgent);
Modified: trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp (288934 => 288935)
--- trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp 2022-02-02 02:02:01 UTC (rev 288934)
+++ trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp 2022-02-02 02:08:23 UTC (rev 288935)
@@ -1866,7 +1866,7 @@
{
WEBPROCESSPROXY_RELEASE_LOG(Loading, "establishServiceWorkerContext: Started");
markProcessAsRecentlyUsed();
- sendWithAsyncReply(Messages::WebProcess::EstablishWorkerContextConnectionToNetworkProcess { processPool().defaultPageGroup().pageGroupID(), m_serviceWorkerInformation->serviceWorkerPageProxyID, m_serviceWorkerInformation->serviceWorkerPageID, store, registrableDomain, serviceWorkerPageIdentifier, m_serviceWorkerInformation->initializationData }, [this, weakThis = WeakPtr { *this }, completionHandler = WTFMove(completionHandler)]() mutable {
+ sendWithAsyncReply(Messages::WebProcess::EstablishServiceWorkerContextConnectionToNetworkProcess { processPool().defaultPageGroup().pageGroupID(), m_serviceWorkerInformation->serviceWorkerPageProxyID, m_serviceWorkerInformation->serviceWorkerPageID, store, registrableDomain, serviceWorkerPageIdentifier, m_serviceWorkerInformation->initializationData }, [this, weakThis = WeakPtr { *this }, completionHandler = WTFMove(completionHandler)]() mutable {
if (weakThis)
WEBPROCESSPROXY_RELEASE_LOG(Loading, "establishServiceWorkerContext: Finished");
completionHandler();
Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (288934 => 288935)
--- trunk/Source/WebKit/WebProcess/WebProcess.cpp 2022-02-02 02:02:01 UTC (rev 288934)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp 2022-02-02 02:08:23 UTC (rev 288935)
@@ -1918,7 +1918,7 @@
}
#if ENABLE(SERVICE_WORKER)
-void WebProcess::establishWorkerContextConnectionToNetworkProcess(PageGroupIdentifier pageGroupID, WebPageProxyIdentifier webPageProxyID, PageIdentifier pageID, const WebPreferencesStore& store, RegistrableDomain&& registrableDomain, std::optional<ScriptExecutionContextIdentifier> serviceWorkerPageIdentifier, ServiceWorkerInitializationData&& initializationData, CompletionHandler<void()>&& completionHandler)
+void WebProcess::establishServiceWorkerContextConnectionToNetworkProcess(PageGroupIdentifier pageGroupID, WebPageProxyIdentifier webPageProxyID, PageIdentifier pageID, const WebPreferencesStore& store, RegistrableDomain&& registrableDomain, std::optional<ScriptExecutionContextIdentifier> serviceWorkerPageIdentifier, ServiceWorkerInitializationData&& initializationData, CompletionHandler<void()>&& completionHandler)
{
// We are in the Service Worker context process and the call below establishes our connection to the Network Process
// by calling ensureNetworkProcessConnection. SWContextManager needs to use the same underlying IPC::Connection as the
Modified: trunk/Source/WebKit/WebProcess/WebProcess.h (288934 => 288935)
--- trunk/Source/WebKit/WebProcess/WebProcess.h 2022-02-02 02:02:01 UTC (rev 288934)
+++ trunk/Source/WebKit/WebProcess/WebProcess.h 2022-02-02 02:08:23 UTC (rev 288935)
@@ -470,7 +470,7 @@
#endif
#if ENABLE(SERVICE_WORKER)
- void establishWorkerContextConnectionToNetworkProcess(PageGroupIdentifier, WebPageProxyIdentifier, WebCore::PageIdentifier, const WebPreferencesStore&, WebCore::RegistrableDomain&&, std::optional<WebCore::ScriptExecutionContextIdentifier> serviceWorkerPageIdentifier, ServiceWorkerInitializationData&&, CompletionHandler<void()>&&);
+ void establishServiceWorkerContextConnectionToNetworkProcess(PageGroupIdentifier, WebPageProxyIdentifier, WebCore::PageIdentifier, const WebPreferencesStore&, WebCore::RegistrableDomain&&, std::optional<WebCore::ScriptExecutionContextIdentifier> serviceWorkerPageIdentifier, ServiceWorkerInitializationData&&, CompletionHandler<void()>&&);
#endif
void fetchWebsiteData(OptionSet<WebsiteDataType>, CompletionHandler<void(WebsiteData&&)>&&);
Modified: trunk/Source/WebKit/WebProcess/WebProcess.messages.in (288934 => 288935)
--- trunk/Source/WebKit/WebProcess/WebProcess.messages.in 2022-02-02 02:02:01 UTC (rev 288934)
+++ trunk/Source/WebKit/WebProcess/WebProcess.messages.in 2022-02-02 02:08:23 UTC (rev 288935)
@@ -101,7 +101,7 @@
#endif
#if ENABLE(SERVICE_WORKER)
- EstablishWorkerContextConnectionToNetworkProcess(WebKit::PageGroupIdentifier pageGroupID, WebKit::WebPageProxyIdentifier webPageProxyID, WebCore::PageIdentifier pageID, struct WebKit::WebPreferencesStore store, WebCore::RegistrableDomain domain, std::optional<WebCore::ScriptExecutionContextIdentifier> serviceWorkerPageIdentifier, struct WebKit::ServiceWorkerInitializationData initializationData) -> () Async
+ EstablishServiceWorkerContextConnectionToNetworkProcess(WebKit::PageGroupIdentifier pageGroupID, WebKit::WebPageProxyIdentifier webPageProxyID, WebCore::PageIdentifier pageID, struct WebKit::WebPreferencesStore store, WebCore::RegistrableDomain domain, std::optional<WebCore::ScriptExecutionContextIdentifier> serviceWorkerPageIdentifier, struct WebKit::ServiceWorkerInitializationData initializationData) -> () Async
#endif
SetHasSuspendedPageProxy(bool hasSuspendedPageProxy);
