WebKit Bugzilla
Attachment 357891 Details for
Bug 192960
: Remove unused SPI WKProcessPool._disableServiceWorkerProcessTerminationDelay
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-192960-20181220160721.patch (text/plain), 13.90 KB, created by
Alex Christensen
on 2018-12-20 16:07:21 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Alex Christensen
Created:
2018-12-20 16:07:21 PST
Size:
13.90 KB
patch
obsolete
>Index: Source/WebCore/ChangeLog >=================================================================== >--- Source/WebCore/ChangeLog (revision 239468) >+++ Source/WebCore/ChangeLog (working copy) >@@ -1,3 +1,15 @@ >+2018-12-20 Alex Christensen <achristensen@webkit.org> >+ >+ Remove unused SPI WKProcessPool._disableServiceWorkerProcessTerminationDelay >+ https://bugs.webkit.org/show_bug.cgi?id=192960 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * workers/service/server/SWServer.cpp: >+ (WebCore::SWServer::unregisterServiceWorkerClient): >+ * workers/service/server/SWServer.h: >+ (WebCore::SWServer::disableServiceWorkerProcessTerminationDelay): Deleted. >+ > 2018-12-20 Chris Dumez <cdumez@apple.com> > > Use Optional::valueOr() instead of Optional::value_or() >Index: Source/WebCore/workers/service/server/SWServer.cpp >=================================================================== >--- Source/WebCore/workers/service/server/SWServer.cpp (revision 239461) >+++ Source/WebCore/workers/service/server/SWServer.cpp (working copy) >@@ -792,7 +792,7 @@ void SWServer::unregisterServiceWorkerCl > > m_clientIdentifiersPerOrigin.remove(clientOrigin); > }); >- iterator->value.terminateServiceWorkersTimer->startOneShot(m_shouldDisableServiceWorkerProcessTerminationDelay ? 0_s : terminationDelay); >+ iterator->value.terminateServiceWorkersTimer->startOneShot(terminationDelay); > } > > auto clientsBySecurityOriginIterator = m_clientsBySecurityOrigin.find(clientOrigin.clientOrigin); >Index: Source/WebCore/workers/service/server/SWServer.h >=================================================================== >--- Source/WebCore/workers/service/server/SWServer.h (revision 239461) >+++ Source/WebCore/workers/service/server/SWServer.h (working copy) >@@ -180,8 +180,6 @@ public: > PAL::SessionID sessionID() const { return m_sessionID; } > WEBCORE_EXPORT bool needsServerToContextConnectionForOrigin(const SecurityOriginData&) const; > >- void disableServiceWorkerProcessTerminationDelay() { m_shouldDisableServiceWorkerProcessTerminationDelay = true; } >- > private: > void scriptFetchFinished(Connection&, const ServiceWorkerFetchResult&); > >@@ -231,7 +229,6 @@ private: > HashMap<SecurityOriginData, HashMap<ServiceWorkerIdentifier, Vector<RunServiceWorkerCallback>>> m_serviceWorkerRunRequests; > PAL::SessionID m_sessionID; > bool m_importCompleted { false }; >- bool m_shouldDisableServiceWorkerProcessTerminationDelay { false }; > Vector<CompletionHandler<void()>> m_clearCompletionCallbacks; > Vector<Function<void(const HashSet<SecurityOriginData>&)>> m_getOriginsWithRegistrationsCallbacks; > }; >Index: Source/WebKit/ChangeLog >=================================================================== >--- Source/WebKit/ChangeLog (revision 239472) >+++ Source/WebKit/ChangeLog (working copy) >@@ -1,3 +1,28 @@ >+2018-12-20 Alex Christensen <achristensen@webkit.org> >+ >+ Remove unused SPI WKProcessPool._disableServiceWorkerProcessTerminationDelay >+ https://bugs.webkit.org/show_bug.cgi?id=192960 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * NetworkProcess/NetworkProcess.cpp: >+ (WebKit::NetworkProcess::initializeNetworkProcess): >+ (WebKit::NetworkProcess::swServerForSession): >+ (WebKit::NetworkProcess::disableServiceWorkerProcessTerminationDelay): Deleted. >+ * NetworkProcess/NetworkProcess.h: >+ * NetworkProcess/NetworkProcess.messages.in: >+ * NetworkProcess/NetworkProcessCreationParameters.cpp: >+ (WebKit::NetworkProcessCreationParameters::encode const): >+ (WebKit::NetworkProcessCreationParameters::decode): >+ * NetworkProcess/NetworkProcessCreationParameters.h: >+ * UIProcess/API/Cocoa/WKProcessPool.mm: >+ (-[WKProcessPool _disableServiceWorkerProcessTerminationDelay]): Deleted. >+ * UIProcess/API/Cocoa/WKProcessPoolPrivate.h: >+ * UIProcess/WebProcessPool.cpp: >+ (WebKit::WebProcessPool::ensureNetworkProcess): >+ (WebKit::WebProcessPool::disableServiceWorkerProcessTerminationDelay): Deleted. >+ * UIProcess/WebProcessPool.h: >+ > 2018-12-20 Jiewen Tan <jiewen_tan@apple.com> > > [WebAuthN] Add a runtime flag for local authenticator >Index: Source/WebKit/NetworkProcess/NetworkProcess.cpp >=================================================================== >--- Source/WebKit/NetworkProcess/NetworkProcess.cpp (revision 239461) >+++ Source/WebKit/NetworkProcess/NetworkProcess.cpp (working copy) >@@ -316,8 +316,6 @@ void NetworkProcess::initializeNetworkPr > > for (auto& scheme : parameters.urlSchemesServiceWorkersCanHandle) > registerURLSchemeServiceWorkersCanHandle(scheme); >- >- m_shouldDisableServiceWorkerProcessTerminationDelay = parameters.shouldDisableServiceWorkerProcessTerminationDelay; > } > #endif > >@@ -1227,10 +1225,7 @@ SWServer& NetworkProcess::swServerForSes > // If there's not, then where did this PAL::SessionID come from? > ASSERT(sessionID.isEphemeral() || !path.isEmpty()); > >- auto value = std::make_unique<SWServer>(makeUniqueRef<WebSWOriginStore>(), WTFMove(path), sessionID); >- if (m_shouldDisableServiceWorkerProcessTerminationDelay) >- value->disableServiceWorkerProcessTerminationDelay(); >- return value; >+ return std::make_unique<SWServer>(makeUniqueRef<WebSWOriginStore>(), WTFMove(path), sessionID); > }); > > return *result.iterator->value; >@@ -1346,16 +1341,6 @@ void NetworkProcess::swContextConnection > m_serverToContextConnections.remove(securityOrigin); > } > >-void NetworkProcess::disableServiceWorkerProcessTerminationDelay() >-{ >- if (m_shouldDisableServiceWorkerProcessTerminationDelay) >- return; >- >- m_shouldDisableServiceWorkerProcessTerminationDelay = true; >- for (auto& swServer : m_swServers.values()) >- swServer->disableServiceWorkerProcessTerminationDelay(); >-} >- > void NetworkProcess::addServiceWorkerSession(PAL::SessionID sessionID, String& serviceWorkerRegistrationDirectory, const SandboxExtension::Handle& handle) > { > auto addResult = m_swDatabasePaths.add(sessionID, serviceWorkerRegistrationDirectory); >Index: Source/WebKit/NetworkProcess/NetworkProcess.h >=================================================================== >--- Source/WebKit/NetworkProcess/NetworkProcess.h (revision 239461) >+++ Source/WebKit/NetworkProcess/NetworkProcess.h (working copy) >@@ -329,8 +329,6 @@ private: > void postMessageToServiceWorkerClient(const WebCore::ServiceWorkerClientIdentifier& destinationIdentifier, WebCore::MessageWithMessagePorts&&, WebCore::ServiceWorkerIdentifier sourceIdentifier, const String& sourceOrigin); > void postMessageToServiceWorker(WebCore::ServiceWorkerIdentifier destination, WebCore::MessageWithMessagePorts&&, const WebCore::ServiceWorkerOrClientIdentifier& source, WebCore::SWServerConnectionIdentifier); > >- void disableServiceWorkerProcessTerminationDelay(); >- > WebSWOriginStore& swOriginStoreForSession(PAL::SessionID); > WebSWOriginStore* existingSWOriginStoreForSession(PAL::SessionID) const; > bool needsServerToContextConnectionForOrigin(const WebCore::SecurityOriginData&) const; >@@ -392,7 +390,6 @@ private: > #if ENABLE(SERVICE_WORKER) > HashMap<WebCore::SecurityOriginData, RefPtr<WebSWServerToContextConnection>> m_serverToContextConnections; > bool m_waitingForServerToContextProcessConnection { false }; >- bool m_shouldDisableServiceWorkerProcessTerminationDelay { false }; > HashMap<PAL::SessionID, String> m_swDatabasePaths; > HashMap<PAL::SessionID, std::unique_ptr<WebCore::SWServer>> m_swServers; > HashMap<WebCore::SWServerConnectionIdentifier, WebSWServerConnection*> m_swServerConnections; >Index: Source/WebKit/NetworkProcess/NetworkProcess.messages.in >=================================================================== >--- Source/WebKit/NetworkProcess/NetworkProcess.messages.in (revision 239461) >+++ Source/WebKit/NetworkProcess/NetworkProcess.messages.in (working copy) >@@ -118,8 +118,6 @@ messages -> NetworkProcess LegacyReceive > PostMessageToServiceWorkerClient(struct WebCore::ServiceWorkerClientIdentifier destinationIdentifier, struct WebCore::MessageWithMessagePorts message, WebCore::ServiceWorkerIdentifier sourceIdentifier, String sourceOrigin) > > PostMessageToServiceWorker(WebCore::ServiceWorkerIdentifier destination, struct WebCore::MessageWithMessagePorts message, WebCore::ServiceWorkerOrClientIdentifier source, WebCore::SWServerConnectionIdentifier connectionIdentifier) >- >- DisableServiceWorkerProcessTerminationDelay() > #endif > > #if ENABLE(INDEXED_DATABASE) >Index: Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp >=================================================================== >--- Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (revision 239461) >+++ Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (working copy) >@@ -105,7 +105,7 @@ void NetworkProcessCreationParameters::e > #endif > > #if ENABLE(SERVICE_WORKER) >- encoder << serviceWorkerRegistrationDirectory << serviceWorkerRegistrationDirectoryExtensionHandle << urlSchemesServiceWorkersCanHandle << shouldDisableServiceWorkerProcessTerminationDelay; >+ encoder << serviceWorkerRegistrationDirectory << serviceWorkerRegistrationDirectoryExtensionHandle << urlSchemesServiceWorkersCanHandle; > #endif > } > >@@ -254,9 +254,6 @@ bool NetworkProcessCreationParameters::d > > if (!decoder.decode(result.urlSchemesServiceWorkersCanHandle)) > return false; >- >- if (!decoder.decode(result.shouldDisableServiceWorkerProcessTerminationDelay)) >- return false; > #endif > > return true; >Index: Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h >=================================================================== >--- Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (revision 239461) >+++ Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (working copy) >@@ -73,7 +73,6 @@ struct NetworkProcessCreationParameters > #endif > bool shouldSuppressMemoryPressureHandler { false }; > bool shouldUseTestingNetworkSession { false }; >- Seconds loadThrottleLatency; > > Vector<String> urlSchemesRegisteredForCustomProtocols; > ProcessID presentingApplicationPID { 0 }; >@@ -123,7 +122,6 @@ struct NetworkProcessCreationParameters > String serviceWorkerRegistrationDirectory; > SandboxExtension::Handle serviceWorkerRegistrationDirectoryExtensionHandle; > Vector<String> urlSchemesServiceWorkersCanHandle; >- bool shouldDisableServiceWorkerProcessTerminationDelay { false }; > #endif > }; > >Index: Source/WebKit/UIProcess/WebProcessPool.cpp >=================================================================== >--- Source/WebKit/UIProcess/WebProcessPool.cpp (revision 239461) >+++ Source/WebKit/UIProcess/WebProcessPool.cpp (working copy) >@@ -545,8 +545,6 @@ NetworkProcessProxy& WebProcessPool::ens > > if (!m_schemesServiceWorkersCanHandle.isEmpty()) > parameters.urlSchemesServiceWorkersCanHandle = copyToVector(m_schemesServiceWorkersCanHandle); >- >- parameters.shouldDisableServiceWorkerProcessTerminationDelay = m_shouldDisableServiceWorkerProcessTerminationDelay; > #endif > > // Add any platform specific parameters >@@ -655,18 +653,6 @@ void WebProcessPool::establishWorkerCont > } > #endif > >-void WebProcessPool::disableServiceWorkerProcessTerminationDelay() >-{ >-#if ENABLE(SERVICE_WORKER) >- if (m_shouldDisableServiceWorkerProcessTerminationDelay) >- return; >- >- m_shouldDisableServiceWorkerProcessTerminationDelay = true; >- if (m_networkProcess) >- m_networkProcess->send(Messages::NetworkProcess::DisableServiceWorkerProcessTerminationDelay(), 0); >-#endif >-} >- > void WebProcessPool::willStartUsingPrivateBrowsing() > { > for (auto* processPool : allProcessPools()) >Index: Source/WebKit/UIProcess/WebProcessPool.h >=================================================================== >--- Source/WebKit/UIProcess/WebProcessPool.h (revision 239461) >+++ Source/WebKit/UIProcess/WebProcessPool.h (working copy) >@@ -278,7 +278,6 @@ public: > void clearCachedCredentials(); > void terminateNetworkProcess(); > void terminateServiceWorkerProcesses(); >- void disableServiceWorkerProcessTerminationDelay(); > > void syncNetworkProcessCookies(); > >@@ -558,7 +557,6 @@ private: > HashMap<WebCore::SecurityOriginData, ServiceWorkerProcessProxy*> m_serviceWorkerProcesses; > bool m_waitingForWorkerContextProcessConnection { false }; > bool m_allowsAnySSLCertificateForServiceWorker { false }; >- bool m_shouldDisableServiceWorkerProcessTerminationDelay { false }; > String m_serviceWorkerUserAgent; > Optional<WebPreferencesStore> m_serviceWorkerPreferences; > HashMap<String, bool> m_mayHaveRegisteredServiceWorkers; >Index: Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm >=================================================================== >--- Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm (revision 239461) >+++ Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm (working copy) >@@ -436,11 +436,6 @@ - (void)_terminateServiceWorkerProcesses > _processPool->terminateServiceWorkerProcesses(); > } > >-- (void)_disableServiceWorkerProcessTerminationDelay >-{ >- _processPool->disableServiceWorkerProcessTerminationDelay(); >-} >- > - (pid_t)_networkProcessIdentifier > { > return _processPool->networkProcessIdentifier(); >Index: Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h >=================================================================== >--- Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h (revision 239461) >+++ Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h (working copy) >@@ -87,7 +87,6 @@ > // Test only. Should be called only while no web content processes are running. > - (void)_terminateNetworkProcess; > - (void)_terminateServiceWorkerProcesses WK_API_AVAILABLE(macosx(10.14), ios(12.0)); >-- (void)_disableServiceWorkerProcessTerminationDelay WK_API_AVAILABLE(macosx(10.14), ios(12.0)); > > // Test only. > - (pid_t)_networkProcessIdentifier WK_API_AVAILABLE(macosx(10.13), ios(11.0));
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 192960
: 357891