<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[225248] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/225248">225248</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2017-11-28 16:28:42 -0800 (Tue, 28 Nov 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Get rid of ServiceWorker::allWorkers() hashmap
https://bugs.webkit.org/show_bug.cgi?id=180111

Reviewed by Brady Eidson.

Get rid of ServiceWorker::allWorkers() hashmap as it is not thread safe and we'll soon have
ServiceWorker objects living in various service worker threads.

Instead, we now have a per-ScriptExecutionContext map, which is inherently thread-safe.

No new tests, no web-facing behavior change.

* dom/ScriptExecutionContext.cpp:
(WebCore::ScriptExecutionContext::registerServiceWorker):
(WebCore::ScriptExecutionContext::unregisterServiceWorker):
* dom/ScriptExecutionContext.h:
(WebCore::ScriptExecutionContext::serviceWorker):
* workers/service/ServiceWorker.cpp:
(WebCore::ServiceWorker::getOrCreate):
(WebCore::ServiceWorker::ServiceWorker):
(WebCore::ServiceWorker::~ServiceWorker):
(WebCore::ServiceWorker::stop):
* workers/service/ServiceWorker.h:
* workers/service/server/SWClientConnection.cpp:
(WebCore::SWClientConnection::updateWorkerState):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContextcpp">trunk/Source/WebCore/dom/ScriptExecutionContext.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContexth">trunk/Source/WebCore/dom/ScriptExecutionContext.h</a></li>
<li><a href="#trunkSourceWebCoreworkersserviceServiceWorkercpp">trunk/Source/WebCore/workers/service/ServiceWorker.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersserviceServiceWorkerh">trunk/Source/WebCore/workers/service/ServiceWorker.h</a></li>
<li><a href="#trunkSourceWebCoreworkersserviceserverSWClientConnectioncpp">trunk/Source/WebCore/workers/service/server/SWClientConnection.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (225247 => 225248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2017-11-29 00:23:29 UTC (rev 225247)
+++ trunk/Source/WebCore/ChangeLog      2017-11-29 00:28:42 UTC (rev 225248)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2017-11-28  Chris Dumez  <cdumez@apple.com>
+
+        Get rid of ServiceWorker::allWorkers() hashmap
+        https://bugs.webkit.org/show_bug.cgi?id=180111
+
+        Reviewed by Brady Eidson.
+
+        Get rid of ServiceWorker::allWorkers() hashmap as it is not thread safe and we'll soon have
+        ServiceWorker objects living in various service worker threads.
+
+        Instead, we now have a per-ScriptExecutionContext map, which is inherently thread-safe.
+
+        No new tests, no web-facing behavior change.
+
+        * dom/ScriptExecutionContext.cpp:
+        (WebCore::ScriptExecutionContext::registerServiceWorker):
+        (WebCore::ScriptExecutionContext::unregisterServiceWorker):
+        * dom/ScriptExecutionContext.h:
+        (WebCore::ScriptExecutionContext::serviceWorker):
+        * workers/service/ServiceWorker.cpp:
+        (WebCore::ServiceWorker::getOrCreate):
+        (WebCore::ServiceWorker::ServiceWorker):
+        (WebCore::ServiceWorker::~ServiceWorker):
+        (WebCore::ServiceWorker::stop):
+        * workers/service/ServiceWorker.h:
+        * workers/service/server/SWClientConnection.cpp:
+        (WebCore::SWClientConnection::updateWorkerState):
+
</ins><span class="cx"> 2017-11-28  Said Abou-Hallawa  <sabouhallawa@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [CG] PostScript images should be supported if they are sub-resource images
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.cpp (225247 => 225248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.cpp      2017-11-29 00:23:29 UTC (rev 225247)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2017-11-29 00:28:42 UTC (rev 225248)
</span><span class="lines">@@ -560,6 +560,17 @@
</span><span class="cx">         connection.serviceWorkerStartedControllingClient(m_activeServiceWorker->identifier(), m_activeServiceWorker->registrationIdentifier(), downcast<Document>(*this).identifier());
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void ScriptExecutionContext::registerServiceWorker(ServiceWorker& serviceWorker)
+{
+    auto addResult = m_serviceWorkers.add(serviceWorker.identifier(), &serviceWorker);
+    ASSERT_UNUSED(addResult, addResult.isNewEntry);
+}
+
+void ScriptExecutionContext::unregisterServiceWorker(ServiceWorker& serviceWorker)
+{
+    m_serviceWorkers.remove(serviceWorker.identifier());
+}
+
</ins><span class="cx"> ServiceWorkerContainer* ScriptExecutionContext::serviceWorkerContainer()
</span><span class="cx"> {
</span><span class="cx">     NavigatorBase* navigator = nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (225247 => 225248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.h        2017-11-29 00:23:29 UTC (rev 225247)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h   2017-11-29 00:28:42 UTC (rev 225248)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "ActiveDOMObject.h"
</span><span class="cx"> #include "DOMTimer.h"
</span><span class="cx"> #include "SecurityContext.h"
</span><ins>+#include "ServiceWorkerIdentifier.h"
</ins><span class="cx"> #include <heap/HandleTypes.h>
</span><span class="cx"> #include <runtime/ConsoleTypes.h>
</span><span class="cx"> #include <wtf/CrossThreadTask.h>
</span><span class="lines">@@ -240,6 +241,10 @@
</span><span class="cx">     ServiceWorker* activeServiceWorker() const;
</span><span class="cx">     void setActiveServiceWorker(RefPtr<ServiceWorker>&&);
</span><span class="cx"> 
</span><ins>+    void registerServiceWorker(ServiceWorker&);
+    void unregisterServiceWorker(ServiceWorker&);
+    ServiceWorker* serviceWorker(ServiceWorkerIdentifier identifier) { return m_serviceWorkers.get(identifier); }
+
</ins><span class="cx">     ServiceWorkerContainer* serviceWorkerContainer();
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -313,6 +318,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(SERVICE_WORKER)
</span><span class="cx">     RefPtr<ServiceWorker> m_activeServiceWorker;
</span><ins>+    HashMap<ServiceWorkerIdentifier, ServiceWorker*> m_serviceWorkers;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersserviceServiceWorkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/service/ServiceWorker.cpp (225247 => 225248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/service/ServiceWorker.cpp   2017-11-29 00:23:29 UTC (rev 225247)
+++ trunk/Source/WebCore/workers/service/ServiceWorker.cpp      2017-11-29 00:28:42 UTC (rev 225248)
</span><span class="lines">@@ -41,31 +41,10 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-const HashMap<ServiceWorkerIdentifier, HashSet<ServiceWorker*>>& ServiceWorker::allWorkers()
-{
-    return mutableAllWorkers();
-}
-
-HashMap<ServiceWorkerIdentifier, HashSet<ServiceWorker*>>& ServiceWorker::mutableAllWorkers()
-{
-    // FIXME: Once we support service workers from workers, this will need to change.
-    RELEASE_ASSERT(isMainThread());
-    
-    static NeverDestroyed<HashMap<ServiceWorkerIdentifier, HashSet<ServiceWorker*>>> allWorkersMap;
-    return allWorkersMap;
-}
-
</del><span class="cx"> Ref<ServiceWorker> ServiceWorker::getOrCreate(ScriptExecutionContext& context, ServiceWorkerData&& data)
</span><span class="cx"> {
</span><del>-    auto it = allWorkers().find(data.identifier);
-    if (it != allWorkers().end()) {
-        for (auto& worker : it->value) {
-            if (worker->scriptExecutionContext() == &context) {
-                ASSERT(!worker->m_isStopped);
-                return *worker;
-            }
-        }
-    }
</del><ins>+    if (auto existingServiceWorker = context.serviceWorker(data.identifier))
+        return *existingServiceWorker;
</ins><span class="cx">     return adoptRef(*new ServiceWorker(context, WTFMove(data)));
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -75,10 +54,7 @@
</span><span class="cx"> {
</span><span class="cx">     suspendIfNeeded();
</span><span class="cx"> 
</span><del>-    auto result = mutableAllWorkers().ensure(identifier(), [] {
-        return HashSet<ServiceWorker*>();
-    });
-    result.iterator->value.add(this);
</del><ins>+    context.registerServiceWorker(*this);
</ins><span class="cx"> 
</span><span class="cx">     relaxAdoptionRequirement();
</span><span class="cx">     updatePendingActivityForEventDispatch();
</span><span class="lines">@@ -86,13 +62,8 @@
</span><span class="cx"> 
</span><span class="cx"> ServiceWorker::~ServiceWorker()
</span><span class="cx"> {
</span><del>-    auto iterator = mutableAllWorkers().find(identifier());
-
-    ASSERT(iterator->value.contains(this));
-    iterator->value.remove(this);
-
-    if (iterator->value.isEmpty())
-        mutableAllWorkers().remove(iterator);
</del><ins>+    if (auto* context = scriptExecutionContext())
+        context->unregisterServiceWorker(*this);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ServiceWorker::scheduleTaskToUpdateState(State state)
</span><span class="lines">@@ -178,6 +149,7 @@
</span><span class="cx"> void ServiceWorker::stop()
</span><span class="cx"> {
</span><span class="cx">     m_isStopped = true;
</span><ins>+    scriptExecutionContext()->unregisterServiceWorker(*this);
</ins><span class="cx">     updatePendingActivityForEventDispatch();
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersserviceServiceWorkerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/service/ServiceWorker.h (225247 => 225248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/service/ServiceWorker.h     2017-11-29 00:23:29 UTC (rev 225247)
+++ trunk/Source/WebCore/workers/service/ServiceWorker.h        2017-11-29 00:28:42 UTC (rev 225248)
</span><span class="lines">@@ -64,11 +64,8 @@
</span><span class="cx">     using RefCounted::ref;
</span><span class="cx">     using RefCounted::deref;
</span><span class="cx"> 
</span><del>-    static const HashMap<ServiceWorkerIdentifier, HashSet<ServiceWorker*>>& allWorkers();
-
</del><span class="cx"> private:
</span><span class="cx">     ServiceWorker(ScriptExecutionContext&, ServiceWorkerData&&);
</span><del>-    static HashMap<ServiceWorkerIdentifier, HashSet<ServiceWorker*>>& mutableAllWorkers();
</del><span class="cx">     void updatePendingActivityForEventDispatch();
</span><span class="cx"> 
</span><span class="cx">     EventTargetInterface eventTargetInterface() const final;
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersserviceserverSWClientConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/service/server/SWClientConnection.cpp (225247 => 225248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/service/server/SWClientConnection.cpp       2017-11-29 00:23:29 UTC (rev 225247)
+++ trunk/Source/WebCore/workers/service/server/SWClientConnection.cpp  2017-11-29 00:28:42 UTC (rev 225248)
</span><span class="lines">@@ -154,8 +154,11 @@
</span><span class="cx"> 
</span><span class="cx"> void SWClientConnection::updateWorkerState(ServiceWorkerIdentifier identifier, ServiceWorkerState state)
</span><span class="cx"> {
</span><del>-    for (auto* worker : ServiceWorker::allWorkers().get(identifier))
-        worker->scheduleTaskToUpdateState(state);
</del><ins>+    // FIXME: We should iterate over all service worker clients, not only documents.
+    for (auto* document : Document::allDocuments()) {
+        if (auto* serviceWorker = document->serviceWorker(identifier))
+            serviceWorker->scheduleTaskToUpdateState(state);
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void SWClientConnection::fireUpdateFoundEvent(ServiceWorkerRegistrationIdentifier identifier)
</span></span></pre>
</div>
</div>

</body>
</html>