<!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>[161847] 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/161847">161847</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-12 18:01:51 -0800 (Sun, 12 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove all uses of AtomicallyInitializedStatic from WebCore
https://bugs.webkit.org/show_bug.cgi?id=126861
Reviewed by Darin Adler.
* Modules/indexeddb/IDBPendingTransactionMonitor.cpp:
(WebCore::transactions):
* fileapi/ThreadableBlobRegistry.cpp:
(WebCore::originMap):
* platform/text/TextEncodingRegistry.cpp:
(WebCore::encodingRegistryMutex):
(WebCore::newTextCodec):
(WebCore::atomicCanonicalTextEncodingName):
(WebCore::dumpTextEncodingNameMap):
* workers/DefaultSharedWorkerRepository.cpp:
(WebCore::DefaultSharedWorkerRepository::instance):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBPendingTransactionMonitorcpp">trunk/Source/WebCore/Modules/indexeddb/IDBPendingTransactionMonitor.cpp</a></li>
<li><a href="#trunkSourceWebCorefileapiThreadableBlobRegistrycpp">trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextTextEncodingRegistrycpp">trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersDefaultSharedWorkerRepositorycpp">trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161846 => 161847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-13 01:44:13 UTC (rev 161846)
+++ trunk/Source/WebCore/ChangeLog 2014-01-13 02:01:51 UTC (rev 161847)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2014-01-12 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Remove all uses of AtomicallyInitializedStatic from WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=126861
+
+ Reviewed by Darin Adler.
+
+ * Modules/indexeddb/IDBPendingTransactionMonitor.cpp:
+ (WebCore::transactions):
+ * fileapi/ThreadableBlobRegistry.cpp:
+ (WebCore::originMap):
+ * platform/text/TextEncodingRegistry.cpp:
+ (WebCore::encodingRegistryMutex):
+ (WebCore::newTextCodec):
+ (WebCore::atomicCanonicalTextEncodingName):
+ (WebCore::dumpTextEncodingNameMap):
+ * workers/DefaultSharedWorkerRepository.cpp:
+ (WebCore::DefaultSharedWorkerRepository::instance):
+
+2014-01-12 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Use an std::atomic<uint32_t> when computing IDBDatabase transaction IDs
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126853
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBPendingTransactionMonitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBPendingTransactionMonitor.cpp (161846 => 161847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBPendingTransactionMonitor.cpp 2014-01-13 01:44:13 UTC (rev 161846)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBPendingTransactionMonitor.cpp 2014-01-13 02:01:51 UTC (rev 161847)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "IDBPendingTransactionMonitor.h"
</span><span class="cx"> #include "IDBTransaction.h"
</span><ins>+#include <mutex>
</ins><span class="cx"> #include <wtf/ThreadSpecific.h>
</span><span class="cx">
</span><span class="cx"> using WTF::ThreadSpecific;
</span><span class="lines">@@ -35,11 +36,17 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> typedef Vector<RefPtr<IDBTransaction>> TransactionList;
</span><ins>+
</ins><span class="cx"> static ThreadSpecific<TransactionList>& transactions()
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Move the Vector to ScriptExecutionContext to avoid dealing with
</span><span class="cx"> // thread-local storage.
</span><del>- AtomicallyInitializedStatic(ThreadSpecific<TransactionList>*, transactions = new ThreadSpecific<TransactionList>);
</del><ins>+ static std::once_flag onceFlag;
+ static ThreadSpecific<TransactionList>* transactions;
+ std::call_once(onceFlag, []{
+ transactions = new ThreadSpecific<TransactionList>;
+ });
+
</ins><span class="cx"> return *transactions;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiThreadableBlobRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp (161846 => 161847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp 2014-01-13 01:44:13 UTC (rev 161846)
+++ trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp 2014-01-13 02:01:51 UTC (rev 161847)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "BlobRegistry.h"
</span><span class="cx"> #include "BlobURL.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><ins>+#include <mutex>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="lines">@@ -74,9 +75,15 @@
</span><span class="cx"> #if ENABLE(BLOB)
</span><span class="cx">
</span><span class="cx"> typedef HashMap<String, RefPtr<SecurityOrigin>> BlobUrlOriginMap;
</span><ins>+
</ins><span class="cx"> static ThreadSpecific<BlobUrlOriginMap>& originMap()
</span><span class="cx"> {
</span><del>- AtomicallyInitializedStatic(ThreadSpecific<BlobUrlOriginMap>*, map = new ThreadSpecific<BlobUrlOriginMap>);
</del><ins>+ static std::once_flag onceFlag;
+ static ThreadSpecific<BlobUrlOriginMap>* map;
+ std::call_once(onceFlag, []{
+ map = new ThreadSpecific<BlobUrlOriginMap>;
+ });
+
</ins><span class="cx"> return *map;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextEncodingRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp (161846 => 161847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp 2014-01-13 01:44:13 UTC (rev 161846)
+++ trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp 2014-01-13 02:01:51 UTC (rev 161847)
</span><span class="lines">@@ -32,10 +32,12 @@
</span><span class="cx"> #include "TextCodecUTF16.h"
</span><span class="cx"> #include "TextCodecUTF8.h"
</span><span class="cx"> #include "TextEncoding.h"
</span><ins>+#include <mutex>
</ins><span class="cx"> #include <wtf/ASCIICType.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/StringExtras.h>
</span><span class="cx">
</span><span class="lines">@@ -105,12 +107,12 @@
</span><span class="cx"> typedef HashMap<const char*, const char*, TextEncodingNameHash> TextEncodingNameMap;
</span><span class="cx"> typedef HashMap<const char*, TextCodecFactory> TextCodecMap;
</span><span class="cx">
</span><del>-static Mutex& encodingRegistryMutex()
</del><ins>+static std::mutex& encodingRegistryMutex()
</ins><span class="cx"> {
</span><del>- // We don't have to use AtomicallyInitializedStatic here because
- // this function is called on the main thread for any page before
- // it is used in worker threads.
- DEFINE_STATIC_LOCAL(Mutex, mutex, ());
</del><ins>+ // We don't have to construct this mutex in a thread safe way because this function
+ // is called on the main thread for any page before it is used in worker threads.
+ static NeverDestroyed<std::mutex> mutex;
+
</ins><span class="cx"> return mutex;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -300,7 +302,7 @@
</span><span class="cx">
</span><span class="cx"> PassOwnPtr<TextCodec> newTextCodec(const TextEncoding& encoding)
</span><span class="cx"> {
</span><del>- MutexLocker lock(encodingRegistryMutex());
</del><ins>+ std::lock_guard<std::mutex> lock(encodingRegistryMutex());
</ins><span class="cx">
</span><span class="cx"> ASSERT(textCodecMap);
</span><span class="cx"> TextCodecFactory factory = textCodecMap->get(encoding.name());
</span><span class="lines">@@ -311,16 +313,18 @@
</span><span class="cx"> const char* atomicCanonicalTextEncodingName(const char* name)
</span><span class="cx"> {
</span><span class="cx"> if (!name || !name[0])
</span><del>- return 0;
</del><ins>+ return nullptr;
+
</ins><span class="cx"> if (!textEncodingNameMap)
</span><span class="cx"> buildBaseTextCodecMaps();
</span><span class="cx">
</span><del>- MutexLocker lock(encodingRegistryMutex());
</del><ins>+ std::lock_guard<std::mutex> lock(encodingRegistryMutex());
</ins><span class="cx">
</span><span class="cx"> if (const char* atomicName = textEncodingNameMap->get(name))
</span><span class="cx"> return atomicName;
</span><span class="cx"> if (didExtendTextCodecMaps)
</span><del>- return 0;
</del><ins>+ return nullptr;
+
</ins><span class="cx"> extendTextCodecMaps();
</span><span class="cx"> didExtendTextCodecMaps = true;
</span><span class="cx"> return textEncodingNameMap->get(name);
</span><span class="lines">@@ -364,7 +368,7 @@
</span><span class="cx"> unsigned size = textEncodingNameMap->size();
</span><span class="cx"> fprintf(stderr, "Dumping %u entries in WebCore::textEncodingNameMap...\n", size);
</span><span class="cx">
</span><del>- MutexLocker lock(encodingRegistryMutex());
</del><ins>+ std::lock_guard<std::mutex> lock(encodingRegistryMutex());
</ins><span class="cx">
</span><span class="cx"> TextEncodingNameMap::const_iterator it = textEncodingNameMap->begin();
</span><span class="cx"> TextEncodingNameMap::const_iterator end = textEncodingNameMap->end();
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersDefaultSharedWorkerRepositorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp (161846 => 161847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp 2014-01-13 01:44:13 UTC (rev 161846)
+++ trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp 2014-01-13 02:01:51 UTC (rev 161847)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> #include "WorkerReportingProxy.h"
</span><span class="cx"> #include "WorkerScriptLoader.h"
</span><span class="cx"> #include "WorkerScriptLoaderClient.h"
</span><ins>+#include <mutex>
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -340,7 +341,12 @@
</span><span class="cx">
</span><span class="cx"> DefaultSharedWorkerRepository& DefaultSharedWorkerRepository::instance()
</span><span class="cx"> {
</span><del>- AtomicallyInitializedStatic(DefaultSharedWorkerRepository*, instance = new DefaultSharedWorkerRepository);
</del><ins>+ static std::once_flag onceFlag;
+ static DefaultSharedWorkerRepository* instance;
+ std::call_once(onceFlag, []{
+ instance = new DefaultSharedWorkerRepository;
+ });
+
</ins><span class="cx"> return *instance;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>