diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoader.h b/Source/WebKit/NetworkProcess/NetworkResourceLoader.h index 20486bbcfe75..2b5e6f5049f8 100644 --- a/Source/WebKit/NetworkProcess/NetworkResourceLoader.h +++ b/Source/WebKit/NetworkProcess/NetworkResourceLoader.h @@ -160,8 +160,6 @@ class NetworkResourceLoader final #if ENABLE(SERVICE_WORKER) void startWithServiceWorker(); void serviceWorkerDidNotHandle(ServiceWorkerFetchTask*); - void setResultingClientIdentifier(String&& identifier) { m_resultingClientIdentifier = WTFMove(identifier); } - const String& resultingClientIdentifier() const { return m_resultingClientIdentifier; } void setServiceWorkerRegistration(WebCore::SWServerRegistration& serviceWorkerRegistration) { m_serviceWorkerRegistration = serviceWorkerRegistration; } void setWorkerStart(MonotonicTime); MonotonicTime workerStart() const { return m_workerStart; } @@ -314,7 +312,6 @@ class NetworkResourceLoader final std::optional m_networkActivityTracker; #if ENABLE(SERVICE_WORKER) std::unique_ptr m_serviceWorkerFetchTask; - String m_resultingClientIdentifier; WeakPtr m_serviceWorkerRegistration; MonotonicTime m_workerStart; #endif diff --git a/Source/WebKit/NetworkProcess/ServiceWorker/ServiceWorkerFetchTask.cpp b/Source/WebKit/NetworkProcess/ServiceWorker/ServiceWorkerFetchTask.cpp index e5b0c8fc694b..26c666cf7671 100644 --- a/Source/WebKit/NetworkProcess/ServiceWorker/ServiceWorkerFetchTask.cpp +++ b/Source/WebKit/NetworkProcess/ServiceWorker/ServiceWorkerFetchTask.cpp @@ -174,8 +174,11 @@ void ServiceWorkerFetchTask::startFetch() if (auto identifier = m_loader.parameters().options.clientIdentifier) clientIdentifier = identifier->toString(); } + String resultingClientIdentifier; + if (auto& identifier = m_loader.parameters().options.resultingClientIdentifier) + resultingClientIdentifier = identifier->toString(); - bool isSent = sendToServiceWorker(Messages::WebSWContextManagerConnection::StartFetch { m_serverConnectionIdentifier, m_serviceWorkerIdentifier, m_fetchIdentifier, request, options, IPC::FormDataReference { m_currentRequest.httpBody() }, referrer, m_preloader && m_preloader->isServiceWorkerNavigationPreloadEnabled(), clientIdentifier, m_loader.resultingClientIdentifier() }); + bool isSent = sendToServiceWorker(Messages::WebSWContextManagerConnection::StartFetch { m_serverConnectionIdentifier, m_serviceWorkerIdentifier, m_fetchIdentifier, request, options, IPC::FormDataReference { m_currentRequest.httpBody() }, referrer, m_preloader && m_preloader->isServiceWorkerNavigationPreloadEnabled(), clientIdentifier, resultingClientIdentifier }); ASSERT_UNUSED(isSent, isSent); } diff --git a/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp b/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp index 3fbe8ac4028b..fb4599037aee 100644 --- a/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp +++ b/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp @@ -217,7 +217,6 @@ std::unique_ptr WebSWServerConnection::createFetchTask(N serviceWorkerRegistrationIdentifier = registration->identifier(); controlClient(loader.parameters(), *registration, request, loader.connectionToWebProcess().webProcessIdentifier()); - loader.setResultingClientIdentifier(resultingClientIdentifier->toString()); loader.setServiceWorkerRegistration(*registration); } else { if (!loader.parameters().serviceWorkerRegistrationIdentifier)