<!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>[161818] trunk/Source</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/161818">161818</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-12 11:45:00 -0800 (Sun, 12 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace more uses of AtomicallyInitializedStatic with std::call_once
https://bugs.webkit.org/show_bug.cgi?id=126847
Reviewed by Sam Weinig.
Source/WebCore:
* crypto/CryptoAlgorithmRegistry.cpp:
(WebCore::CryptoAlgorithmRegistry::shared):
(WebCore::registryMutex):
(WebCore::CryptoAlgorithmRegistry::getIdentifierForName):
(WebCore::CryptoAlgorithmRegistry::nameForIdentifier):
(WebCore::CryptoAlgorithmRegistry::create):
(WebCore::CryptoAlgorithmRegistry::registerAlgorithm):
* crypto/CryptoAlgorithmRegistry.h:
* inspector/WorkerDebuggerAgent.cpp:
(WebCore::WorkerDebuggerAgent::WorkerDebuggerAgent):
(WebCore::WorkerDebuggerAgent::~WorkerDebuggerAgent):
(WebCore::WorkerDebuggerAgent::interruptAndDispatchInspectorCommands):
* workers/WorkerThread.cpp:
(WebCore::threadSetMutex):
(WebCore::workerThreads):
(WebCore::WorkerThread::workerThreadCount):
(WebCore::WorkerThread::WorkerThread):
(WebCore::WorkerThread::~WorkerThread):
(WebCore::WorkerThread::releaseFastMallocFreeMemoryInAllThreads):
Source/WTF:
* wtf/Forward.h:
Forward declare NeverDestroyed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfForwardh">trunk/Source/WTF/wtf/Forward.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecryptoCryptoAlgorithmRegistrycpp">trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoCryptoAlgorithmRegistryh">trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerDebuggerAgentcpp">trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerThreadcpp">trunk/Source/WebCore/workers/WorkerThread.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (161817 => 161818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-01-12 19:24:29 UTC (rev 161817)
+++ trunk/Source/WTF/ChangeLog 2014-01-12 19:45:00 UTC (rev 161818)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-01-12 Anders Carlsson <andersca@apple.com>
+
+ Replace more uses of AtomicallyInitializedStatic with std::call_once
+ https://bugs.webkit.org/show_bug.cgi?id=126847
+
+ Reviewed by Sam Weinig.
+
+ * wtf/Forward.h:
+ Forward declare NeverDestroyed.
+
</ins><span class="cx"> 2014-01-11 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix for ports using GCC after r161770.
</span></span></pre></div>
<a id="trunkSourceWTFwtfForwardh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Forward.h (161817 => 161818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Forward.h 2014-01-12 19:24:29 UTC (rev 161817)
+++ trunk/Source/WTF/wtf/Forward.h 2014-01-12 19:45:00 UTC (rev 161818)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="cx"> template<typename T> class Function;
</span><ins>+template<typename T> class NeverDestroyed;
</ins><span class="cx"> template<typename T> class OwnPtr;
</span><span class="cx"> template<typename T> class PassOwnPtr;
</span><span class="cx"> template<typename T> class PassRef;
</span><span class="lines">@@ -59,6 +60,7 @@
</span><span class="cx"> using WTF::Encoder;
</span><span class="cx"> using WTF::Function;
</span><span class="cx"> using WTF::FunctionDispatcher;
</span><ins>+using WTF::NeverDestroyed;
</ins><span class="cx"> using WTF::OwnPtr;
</span><span class="cx"> using WTF::PassOwnPtr;
</span><span class="cx"> using WTF::PassRef;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161817 => 161818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-12 19:24:29 UTC (rev 161817)
+++ trunk/Source/WebCore/ChangeLog 2014-01-12 19:45:00 UTC (rev 161818)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-01-12 Anders Carlsson <andersca@apple.com>
+
+ Replace more uses of AtomicallyInitializedStatic with std::call_once
+ https://bugs.webkit.org/show_bug.cgi?id=126847
+
+ Reviewed by Sam Weinig.
+
+ * crypto/CryptoAlgorithmRegistry.cpp:
+ (WebCore::CryptoAlgorithmRegistry::shared):
+ (WebCore::registryMutex):
+ (WebCore::CryptoAlgorithmRegistry::getIdentifierForName):
+ (WebCore::CryptoAlgorithmRegistry::nameForIdentifier):
+ (WebCore::CryptoAlgorithmRegistry::create):
+ (WebCore::CryptoAlgorithmRegistry::registerAlgorithm):
+ * crypto/CryptoAlgorithmRegistry.h:
+ * inspector/WorkerDebuggerAgent.cpp:
+ (WebCore::WorkerDebuggerAgent::WorkerDebuggerAgent):
+ (WebCore::WorkerDebuggerAgent::~WorkerDebuggerAgent):
+ (WebCore::WorkerDebuggerAgent::interruptAndDispatchInspectorCommands):
+ * workers/WorkerThread.cpp:
+ (WebCore::threadSetMutex):
+ (WebCore::workerThreads):
+ (WebCore::WorkerThread::workerThreadCount):
+ (WebCore::WorkerThread::WorkerThread):
+ (WebCore::WorkerThread::~WorkerThread):
+ (WebCore::WorkerThread::releaseFastMallocFreeMemoryInAllThreads):
+
</ins><span class="cx"> 2014-01-11 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Split ICU UText providers out into their own files
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoCryptoAlgorithmRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp (161817 => 161818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp 2014-01-12 19:24:29 UTC (rev 161817)
+++ trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp 2014-01-12 19:45:00 UTC (rev 161818)
</span><span class="lines">@@ -29,20 +29,28 @@
</span><span class="cx"> #if ENABLE(SUBTLE_CRYPTO)
</span><span class="cx">
</span><span class="cx"> #include "CryptoAlgorithm.h"
</span><del>-#include <wtf/MainThread.h>
</del><ins>+#include <mutex>
+#include <wtf/NeverDestroyed.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> CryptoAlgorithmRegistry& CryptoAlgorithmRegistry::shared()
</span><span class="cx"> {
</span><del>- DEFINE_STATIC_LOCAL(CryptoAlgorithmRegistry, registry, ());
</del><ins>+ static NeverDestroyed<CryptoAlgorithmRegistry> registry;
+
</ins><span class="cx"> return registry;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Mutex& registryMutex()
</del><ins>+static std::mutex& registryMutex()
</ins><span class="cx"> {
</span><del>- AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex);
- return mutex;
</del><ins>+ static std::once_flag onceFlag;
+ static std::mutex* mutex;
+
+ std::call_once(onceFlag, []{
+ mutex = std::make_unique<std::mutex>().release();
+ });
+
+ return *mutex;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CryptoAlgorithmRegistry::CryptoAlgorithmRegistry()
</span><span class="lines">@@ -55,7 +63,7 @@
</span><span class="cx"> if (name.isEmpty())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- MutexLocker lock(registryMutex());
</del><ins>+ std::lock_guard<std::mutex> lock(registryMutex());
</ins><span class="cx">
</span><span class="cx"> auto iter = m_nameToIdentifierMap.find(name.isolatedCopy());
</span><span class="cx"> if (iter == m_nameToIdentifierMap.end())
</span><span class="lines">@@ -67,14 +75,14 @@
</span><span class="cx">
</span><span class="cx"> String CryptoAlgorithmRegistry::nameForIdentifier(CryptoAlgorithmIdentifier identifier)
</span><span class="cx"> {
</span><del>- MutexLocker lock(registryMutex());
</del><ins>+ std::lock_guard<std::mutex> lock(registryMutex());
</ins><span class="cx">
</span><span class="cx"> return m_identifierToNameMap.get(static_cast<unsigned>(identifier)).isolatedCopy();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<CryptoAlgorithm> CryptoAlgorithmRegistry::create(CryptoAlgorithmIdentifier identifier)
</span><span class="cx"> {
</span><del>- MutexLocker lock(registryMutex());
</del><ins>+ std::lock_guard<std::mutex> lock(registryMutex());
</ins><span class="cx">
</span><span class="cx"> auto iter = m_identifierToConstructorMap.find(static_cast<unsigned>(identifier));
</span><span class="cx"> if (iter == m_identifierToConstructorMap.end())
</span><span class="lines">@@ -85,7 +93,7 @@
</span><span class="cx">
</span><span class="cx"> void CryptoAlgorithmRegistry::registerAlgorithm(const String& name, CryptoAlgorithmIdentifier identifier, CryptoAlgorithmConstructor constructor)
</span><span class="cx"> {
</span><del>- MutexLocker lock(registryMutex());
</del><ins>+ std::lock_guard<std::mutex> lock(registryMutex());
</ins><span class="cx">
</span><span class="cx"> bool added = m_nameToIdentifierMap.add(name, identifier).isNewEntry;
</span><span class="cx"> ASSERT_UNUSED(added, added);
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoCryptoAlgorithmRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.h (161817 => 161818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.h 2014-01-12 19:24:29 UTC (rev 161817)
+++ trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.h 2014-01-12 19:45:00 UTC (rev 161818)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx">
</span><span class="cx"> class CryptoAlgorithmRegistry {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(CryptoAlgorithmRegistry);
</span><ins>+ friend class NeverDestroyed<CryptoAlgorithmRegistry>;
</ins><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> static CryptoAlgorithmRegistry& shared();
</span><span class="lines">@@ -63,6 +64,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void registerAlgorithm(const String& name, CryptoAlgorithmIdentifier, CryptoAlgorithmConstructor);
</span><ins>+
</ins><span class="cx"> HashMap<String, CryptoAlgorithmIdentifier, CaseFoldingHash> m_nameToIdentifierMap;
</span><span class="cx"> HashMap<unsigned, String> m_identifierToNameMap;
</span><span class="cx"> HashMap<unsigned, CryptoAlgorithmConstructor> m_identifierToConstructorMap;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp (161817 => 161818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp 2014-01-12 19:24:29 UTC (rev 161817)
+++ trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp 2014-01-12 19:45:00 UTC (rev 161818)
</span><span class="lines">@@ -38,7 +38,9 @@
</span><span class="cx"> #include "WorkerThread.h"
</span><span class="cx"> #include <inspector/InjectedScript.h>
</span><span class="cx"> #include <inspector/InjectedScriptManager.h>
</span><ins>+#include <mutex>
</ins><span class="cx"> #include <wtf/MessageQueue.h>
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><span class="lines">@@ -46,21 +48,27 @@
</span><span class="cx">
</span><span class="cx"> namespace {
</span><span class="cx">
</span><del>-Mutex& workerDebuggerAgentsMutex()
</del><ins>+std::mutex& workerDebuggerAgentsMutex()
</ins><span class="cx"> {
</span><del>- AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex);
- return mutex;
</del><ins>+ static std::once_flag onceFlag;
+ static std::mutex* mutex;
+
+ std::call_once(onceFlag, []{
+ mutex = std::make_unique<std::mutex>().release();
+ });
+
+ return *mutex;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> typedef HashMap<WorkerThread*, WorkerDebuggerAgent*> WorkerDebuggerAgents;
</span><span class="cx">
</span><span class="cx"> WorkerDebuggerAgents& workerDebuggerAgents()
</span><span class="cx"> {
</span><del>- DEFINE_STATIC_LOCAL(WorkerDebuggerAgents, agents, ());
</del><ins>+ static NeverDestroyed<WorkerDebuggerAgents> agents;
+
</ins><span class="cx"> return agents;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> class RunInspectorCommandsTask : public ScriptDebugServer::Task {
</span><span class="cx"> public:
</span><span class="cx"> RunInspectorCommandsTask(WorkerThread* thread, WorkerGlobalScope* workerGlobalScope)
</span><span class="lines">@@ -89,22 +97,23 @@
</span><span class="cx"> , m_scriptDebugServer(inspectedWorkerGlobalScope, WorkerDebuggerAgent::debuggerTaskMode)
</span><span class="cx"> , m_inspectedWorkerGlobalScope(inspectedWorkerGlobalScope)
</span><span class="cx"> {
</span><del>- MutexLocker lock(workerDebuggerAgentsMutex());
</del><ins>+ std::lock_guard<std::mutex> lock(workerDebuggerAgentsMutex());
</ins><span class="cx"> workerDebuggerAgents().set(inspectedWorkerGlobalScope->thread(), this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WorkerDebuggerAgent::~WorkerDebuggerAgent()
</span><span class="cx"> {
</span><del>- MutexLocker lock(workerDebuggerAgentsMutex());
</del><ins>+ std::lock_guard<std::mutex> lock(workerDebuggerAgentsMutex());
+
</ins><span class="cx"> ASSERT(workerDebuggerAgents().contains(m_inspectedWorkerGlobalScope->thread()));
</span><span class="cx"> workerDebuggerAgents().remove(m_inspectedWorkerGlobalScope->thread());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerDebuggerAgent::interruptAndDispatchInspectorCommands(WorkerThread* thread)
</span><span class="cx"> {
</span><del>- MutexLocker lock(workerDebuggerAgentsMutex());
- WorkerDebuggerAgent* agent = workerDebuggerAgents().get(thread);
- if (agent)
</del><ins>+ std::lock_guard<std::mutex> lock(workerDebuggerAgentsMutex());
+
+ if (WorkerDebuggerAgent* agent = workerDebuggerAgents().get(thread))
</ins><span class="cx"> agent->m_scriptDebugServer.interruptAndRunTask(adoptPtr(new RunInspectorCommandsTask(thread, agent->m_inspectedWorkerGlobalScope)));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerThread.cpp (161817 => 161818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerThread.cpp 2014-01-12 19:24:29 UTC (rev 161817)
+++ trunk/Source/WebCore/workers/WorkerThread.cpp 2014-01-12 19:45:00 UTC (rev 161818)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "ThreadGlobalData.h"
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include <utility>
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -49,21 +50,29 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static Mutex& threadSetMutex()
</del><ins>+static std::mutex& threadSetMutex()
</ins><span class="cx"> {
</span><del>- AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex);
- return mutex;
</del><ins>+ static std::once_flag onceFlag;
+ static std::mutex* mutex;
+
+ std::call_once(onceFlag, []{
+ mutex = std::make_unique<std::mutex>().release();
+ });
+
+ return *mutex;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static HashSet<WorkerThread*>& workerThreads()
</span><span class="cx"> {
</span><del>- DEFINE_STATIC_LOCAL(HashSet<WorkerThread*>, threads, ());
- return threads;
</del><ins>+ static NeverDestroyed<HashSet<WorkerThread*>> workerThreads;
+
+ return workerThreads;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned WorkerThread::workerThreadCount()
</span><span class="cx"> {
</span><del>- MutexLocker lock(threadSetMutex());
</del><ins>+ std::lock_guard<std::mutex> lock(threadSetMutex());
+
</ins><span class="cx"> return workerThreads().size();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -114,13 +123,15 @@
</span><span class="cx"> , m_notificationClient(0)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><del>- MutexLocker lock(threadSetMutex());
</del><ins>+ std::lock_guard<std::mutex> lock(threadSetMutex());
+
</ins><span class="cx"> workerThreads().add(this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WorkerThread::~WorkerThread()
</span><span class="cx"> {
</span><del>- MutexLocker lock(threadSetMutex());
</del><ins>+ std::lock_guard<std::mutex> lock(threadSetMutex());
+
</ins><span class="cx"> ASSERT(workerThreads().contains(this));
</span><span class="cx"> workerThreads().remove(this);
</span><span class="cx"> }
</span><span class="lines">@@ -279,11 +290,10 @@
</span><span class="cx">
</span><span class="cx"> void WorkerThread::releaseFastMallocFreeMemoryInAllThreads()
</span><span class="cx"> {
</span><del>- MutexLocker lock(threadSetMutex());
- HashSet<WorkerThread*>& threads = workerThreads();
- HashSet<WorkerThread*>::iterator end = threads.end();
- for (HashSet<WorkerThread*>::iterator it = threads.begin(); it != end; ++it)
- (*it)->runLoop().postTask(adoptPtr(new ReleaseFastMallocFreeMemoryTask));
</del><ins>+ std::lock_guard<std::mutex> lock(threadSetMutex());
+
+ for (auto* workerThread : workerThreads())
+ workerThread->runLoop().postTask(adoptPtr(new ReleaseFastMallocFreeMemoryTask));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>