<!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>[161835] 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/161835">161835</a></dd>

<dt>Author</dt> <dd>andersca@apple.com</dd>

<dt>Date</dt> <dd>2014-01-12 13:31:09 -0800 (Sun, 12 Jan 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>Use std::call_once instead of AtomicallyInitializedStatic in DatabaseBackendBase

https://bugs.webkit.org/show_bug.cgi?id=126851

Reviewed by Sam Weinig.

* Modules/webdatabase/DatabaseBackendBase.cpp:

(WebCore::guidMutex):

(WebCore::guidToVersionMap):

(WebCore::updateGuidVersionMap):

(WebCore::guidToDatabaseMap):

(WebCore::guidForOriginAndName):

(WebCore::DatabaseBackendBase::DatabaseBackendBase):

(WebCore::DatabaseBackendBase::closeDatabase):

(WebCore::DatabaseBackendBase::performOpenAndVerify):

(WebCore::DatabaseBackendBase::getCachedVersion):

(WebCore::DatabaseBackendBase::setCachedVersion):</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBasecpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161834 => 161835)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-01-12 21:23:45 UTC (rev 161834)

+++ trunk/Source/WebCore/ChangeLog        2014-01-12 21:31:09 UTC (rev 161835)

</span><span class="lines">@@ -1,3 +1,22 @@

</span><ins>+2014-01-12  Anders Carlsson  &lt;andersca@apple.com&gt;

+

+        Use std::call_once instead of AtomicallyInitializedStatic in DatabaseBackendBase

+        https://bugs.webkit.org/show_bug.cgi?id=126851

+

+        Reviewed by Sam Weinig.

+

+        * Modules/webdatabase/DatabaseBackendBase.cpp:

+        (WebCore::guidMutex):

+        (WebCore::guidToVersionMap):

+        (WebCore::updateGuidVersionMap):

+        (WebCore::guidToDatabaseMap):

+        (WebCore::guidForOriginAndName):

+        (WebCore::DatabaseBackendBase::DatabaseBackendBase):

+        (WebCore::DatabaseBackendBase::closeDatabase):

+        (WebCore::DatabaseBackendBase::performOpenAndVerify):

+        (WebCore::DatabaseBackendBase::getCachedVersion):

+        (WebCore::DatabaseBackendBase::setCachedVersion):

+

</ins><span class="cx"> 2014-01-12  Dan Bernstein  &lt;mitz@apple.com&gt;

</span><span class="cx"> 

<span class="cx">         Try to fix the Windows build after r161830.

</span></span></pre></div>

<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBasecpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp (161834 => 161835)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp        2014-01-12 21:23:45 UTC (rev 161834)

+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp        2014-01-12 21:31:09 UTC (rev 161835)

</span><span class="lines">@@ -141,18 +141,25 @@

</span><span class="cx"> }

</span><span class="cx"> 

<span class="cx"> // FIXME: move all guid-related functions to a DatabaseVersionTracker class.

</span><del>-static Mutex&amp; guidMutex()

</del><ins>+static std::mutex&amp; guidMutex()

</ins><span class="cx"> {

</span><del>-    AtomicallyInitializedStatic(Mutex&amp;, mutex = *new Mutex);

-    return mutex;

</del><ins>+    static std::once_flag onceFlag;

+    static std::mutex* mutex;

+

+    std::call_once(onceFlag, []{

+        mutex = std::make_unique&lt;std::mutex&gt;().release();

+    });

+

+    return *mutex;

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> typedef HashMap&lt;DatabaseGuid, String&gt; GuidVersionMap;

</span><span class="cx"> static GuidVersionMap&amp; guidToVersionMap()

</span><span class="cx"> {

<span class="cx">     // Ensure the the mutex is locked.

</span><del>-    ASSERT(!guidMutex().tryLock());

-    DEFINE_STATIC_LOCAL(GuidVersionMap, map, ());

</del><ins>+    ASSERT(!guidMutex().try_lock());

+

+    static NeverDestroyed&lt;GuidVersionMap&gt; map;

</ins><span class="cx">     return map;

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="lines">@@ -160,7 +167,7 @@

</span><span class="cx"> static inline void updateGuidVersionMap(DatabaseGuid guid, String newVersion)

</span><span class="cx"> {

<span class="cx">     // Ensure the the mutex is locked.

</span><del>-    ASSERT(!guidMutex().tryLock());

</del><ins>+    ASSERT(!guidMutex().try_lock());

</ins><span class="cx"> 

<span class="cx">     // Note: It is not safe to put an empty string into the guidToVersionMap() map.

<span class="cx">     // That's because the map is cross-thread, but empty strings are per-thread.

</span><span class="lines">@@ -177,7 +184,8 @@

</span><span class="cx"> static GuidDatabaseMap&amp; guidToDatabaseMap()

</span><span class="cx"> {

<span class="cx">     // Ensure the the mutex is locked.

</span><del>-    ASSERT(!guidMutex().tryLock());

</del><ins>+    ASSERT(!guidMutex().try_lock());

+

</ins><span class="cx">     static NeverDestroyed&lt;GuidDatabaseMap&gt; map;

</span><span class="cx">     return map;

</span><span class="cx"> }

</span><span class="lines">@@ -185,7 +193,7 @@

</span><span class="cx"> static DatabaseGuid guidForOriginAndName(const String&amp; origin, const String&amp; name)

</span><span class="cx"> {

<span class="cx">     // Ensure the the mutex is locked.

</span><del>-    ASSERT(!guidMutex().tryLock());

</del><ins>+    ASSERT(!guidMutex().try_lock());

</ins><span class="cx"> 

</span><span class="cx">     String stringID = origin + &quot;/&quot; + name;

</span><span class="cx"> 

</span><span class="lines">@@ -233,7 +241,8 @@

</span><span class="cx">         m_name = emptyString();

</span><span class="cx"> 

</span><span class="cx">     {

</span><del>-        MutexLocker locker(guidMutex());

</del><ins>+        std::lock_guard&lt;std::mutex&gt; locker(guidMutex());

+

</ins><span class="cx">         m_guid = guidForOriginAndName(securityOrigin()-&gt;toString(), name);

</span><span class="cx">         std::unique_ptr&lt;HashSet&lt;DatabaseBackendBase*&gt;&gt;&amp; hashSet = guidToDatabaseMap().add(m_guid, nullptr).iterator-&gt;value;

</span><span class="cx">         if (!hashSet)

</span><span class="lines">@@ -268,7 +277,7 @@

<span class="cx">     // See comment at the top this file regarding calling removeOpenDatabase().

</span><span class="cx">     DatabaseTracker::tracker().removeOpenDatabase(this);

</span><span class="cx">     {

</span><del>-        MutexLocker locker(guidMutex());

</del><ins>+        std::lock_guard&lt;std::mutex&gt; locker(guidMutex());

</ins><span class="cx"> 

</span><span class="cx">         auto it = guidToDatabaseMap().find(m_guid);

</span><span class="cx">         ASSERT(it != guidToDatabaseMap().end());

</span><span class="lines">@@ -337,7 +346,7 @@

</span><span class="cx"> 

</span><span class="cx">     String currentVersion;

</span><span class="cx">     {

</span><del>-        MutexLocker locker(guidMutex());

</del><ins>+        std::lock_guard&lt;std::mutex&gt; locker(guidMutex());

</ins><span class="cx"> 

</span><span class="cx">         auto entry = guidToVersionMap().find(m_guid);

</span><span class="cx">         if (entry != guidToVersionMap().end()) {

</span><span class="lines">@@ -496,14 +505,16 @@

</span><span class="cx"> 

</span><span class="cx"> String DatabaseBackendBase::getCachedVersion() const

</span><span class="cx"> {

</span><del>-    MutexLocker locker(guidMutex());

</del><ins>+    std::lock_guard&lt;std::mutex&gt; locker(guidMutex());

+

</ins><span class="cx">     return guidToVersionMap().get(m_guid).isolatedCopy();

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> void DatabaseBackendBase::setCachedVersion(const String&amp; actualVersion)

</span><span class="cx"> {

<span class="cx">     // Update the in memory database version map.

</span><del>-    MutexLocker locker(guidMutex());

</del><ins>+    std::lock_guard&lt;std::mutex&gt; locker(guidMutex());

+

</ins><span class="cx">     updateGuidVersionMap(m_guid, actualVersion);

</span><span class="cx"> }

</span><span class="cx"> 

</span></span></pre>

</div>

</div>

</body>

</html>