Title: [229612] trunk/Source
- Revision
- 229612
- Author
- [email protected]
- Date
- 2018-03-14 13:43:48 -0700 (Wed, 14 Mar 2018)
Log Message
Drop unnecessary StorageToWebProcessConnection::workerContextProcessConnectionCreated()
https://bugs.webkit.org/show_bug.cgi?id=183624
Reviewed by Youenn Fablet.
Source/WebCore:
Pass in context connection to SWServer::serverToContextConnectionCreated() to avoid
relying on the deprecated globalServerToContextConnection().
No new tests, no expected behavior change.
* workers/service/server/SWServer.cpp:
(WebCore::SWServer::serverToContextConnectionCreated):
* workers/service/server/SWServer.h:
Source/WebKit:
Drop unnecessary StorageToWebProcessConnection::workerContextProcessConnectionCreated()
since it was going through all SWServers. Calling workerContextProcessConnectionCreated()
on every StorageToWebProcessConnection was thus doing redundant work.
* StorageProcess/StorageProcess.cpp:
(WebKit::StorageProcess::createStorageToWebProcessConnection):
* StorageProcess/StorageToWebProcessConnection.cpp:
(WebKit::StorageToWebProcessConnection::establishSWServerConnection):
(WebKit::StorageToWebProcessConnection::workerContextProcessConnectionCreated): Deleted.
* StorageProcess/StorageToWebProcessConnection.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (229611 => 229612)
--- trunk/Source/WebCore/ChangeLog 2018-03-14 20:20:20 UTC (rev 229611)
+++ trunk/Source/WebCore/ChangeLog 2018-03-14 20:43:48 UTC (rev 229612)
@@ -1,3 +1,19 @@
+2018-03-14 Chris Dumez <[email protected]>
+
+ Drop unnecessary StorageToWebProcessConnection::workerContextProcessConnectionCreated()
+ https://bugs.webkit.org/show_bug.cgi?id=183624
+
+ Reviewed by Youenn Fablet.
+
+ Pass in context connection to SWServer::serverToContextConnectionCreated() to avoid
+ relying on the deprecated globalServerToContextConnection().
+
+ No new tests, no expected behavior change.
+
+ * workers/service/server/SWServer.cpp:
+ (WebCore::SWServer::serverToContextConnectionCreated):
+ * workers/service/server/SWServer.h:
+
2018-03-14 Mark Lam <[email protected]>
Enhance the MacroAssembler and LinkBuffer to support pointer profiling.
Modified: trunk/Source/WebCore/workers/service/server/SWServer.cpp (229611 => 229612)
--- trunk/Source/WebCore/workers/service/server/SWServer.cpp 2018-03-14 20:20:20 UTC (rev 229611)
+++ trunk/Source/WebCore/workers/service/server/SWServer.cpp 2018-03-14 20:43:48 UTC (rev 229612)
@@ -508,11 +508,8 @@
installContextData(data);
}
-void SWServer::serverToContextConnectionCreated()
+void SWServer::serverToContextConnectionCreated(SWServerToContextConnection& contextConnection)
{
- auto* connection = SWServerToContextConnection::globalServerToContextConnection();
- ASSERT(connection);
-
auto pendingContextDatas = WTFMove(m_pendingContextDatas);
for (auto& data : pendingContextDatas)
installContextData(data);
@@ -521,7 +518,7 @@
for (auto& item : serviceWorkerRunRequests) {
bool success = runServiceWorker(item.key);
for (auto& callback : item.value)
- callback(success, *connection);
+ callback(success, contextConnection);
}
}
Modified: trunk/Source/WebCore/workers/service/server/SWServer.h (229611 => 229612)
--- trunk/Source/WebCore/workers/service/server/SWServer.h 2018-03-14 20:20:20 UTC (rev 229611)
+++ trunk/Source/WebCore/workers/service/server/SWServer.h 2018-03-14 20:43:48 UTC (rev 229612)
@@ -157,7 +157,7 @@
void matchAll(SWServerWorker&, const ServiceWorkerClientQueryOptions&, ServiceWorkerClientsMatchAllCallback&&);
void claim(SWServerWorker&);
- WEBCORE_EXPORT void serverToContextConnectionCreated();
+ WEBCORE_EXPORT void serverToContextConnectionCreated(SWServerToContextConnection&);
WEBCORE_EXPORT static HashSet<SWServer*>& allServers();
Modified: trunk/Source/WebKit/ChangeLog (229611 => 229612)
--- trunk/Source/WebKit/ChangeLog 2018-03-14 20:20:20 UTC (rev 229611)
+++ trunk/Source/WebKit/ChangeLog 2018-03-14 20:43:48 UTC (rev 229612)
@@ -1,3 +1,21 @@
+2018-03-14 Chris Dumez <[email protected]>
+
+ Drop unnecessary StorageToWebProcessConnection::workerContextProcessConnectionCreated()
+ https://bugs.webkit.org/show_bug.cgi?id=183624
+
+ Reviewed by Youenn Fablet.
+
+ Drop unnecessary StorageToWebProcessConnection::workerContextProcessConnectionCreated()
+ since it was going through all SWServers. Calling workerContextProcessConnectionCreated()
+ on every StorageToWebProcessConnection was thus doing redundant work.
+
+ * StorageProcess/StorageProcess.cpp:
+ (WebKit::StorageProcess::createStorageToWebProcessConnection):
+ * StorageProcess/StorageToWebProcessConnection.cpp:
+ (WebKit::StorageToWebProcessConnection::establishSWServerConnection):
+ (WebKit::StorageToWebProcessConnection::workerContextProcessConnectionCreated): Deleted.
+ * StorageProcess/StorageToWebProcessConnection.h:
+
2018-03-14 Tim Horton <[email protected]>
Fix the build after r229567
Modified: trunk/Source/WebKit/StorageProcess/StorageProcess.cpp (229611 => 229612)
--- trunk/Source/WebKit/StorageProcess/StorageProcess.cpp 2018-03-14 20:20:20 UTC (rev 229611)
+++ trunk/Source/WebKit/StorageProcess/StorageProcess.cpp 2018-03-14 20:43:48 UTC (rev 229612)
@@ -271,8 +271,8 @@
m_serverToContextConnection = WebSWServerToContextConnection::create(m_storageToWebProcessConnections.last()->connection());
m_waitingForServerToContextProcessConnection = false;
- for (auto& connection : m_storageToWebProcessConnections)
- connection->workerContextProcessConnectionCreated();
+ for (auto* server : SWServer::allServers())
+ server->serverToContextConnectionCreated(*m_serverToContextConnection);
}
#else
UNUSED_PARAM(isServiceWorkerProcess);
Modified: trunk/Source/WebKit/StorageProcess/StorageToWebProcessConnection.cpp (229611 => 229612)
--- trunk/Source/WebKit/StorageProcess/StorageToWebProcessConnection.cpp 2018-03-14 20:20:20 UTC (rev 229611)
+++ trunk/Source/WebKit/StorageProcess/StorageToWebProcessConnection.cpp 2018-03-14 20:43:48 UTC (rev 229612)
@@ -170,12 +170,6 @@
auto addResult = m_swConnections.add(serverConnectionIdentifier, WTFMove(connection));
ASSERT_UNUSED(addResult, addResult.isNewEntry);
}
-
-void StorageToWebProcessConnection::workerContextProcessConnectionCreated()
-{
- for (auto* server : SWServer::allServers())
- server->serverToContextConnectionCreated();
-}
#endif
#if ENABLE(INDEXED_DATABASE)
Modified: trunk/Source/WebKit/StorageProcess/StorageToWebProcessConnection.h (229611 => 229612)
--- trunk/Source/WebKit/StorageProcess/StorageToWebProcessConnection.h 2018-03-14 20:20:20 UTC (rev 229611)
+++ trunk/Source/WebKit/StorageProcess/StorageToWebProcessConnection.h 2018-03-14 20:43:48 UTC (rev 229612)
@@ -44,10 +44,6 @@
IPC::Connection& connection() { return m_connection.get(); }
-#if ENABLE(SERVICE_WORKER)
- void workerContextProcessConnectionCreated();
-#endif
-
private:
StorageToWebProcessConnection(IPC::Connection::Identifier);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
