<!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>[173240] 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/173240">173240</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-09-03 15:56:48 -0700 (Wed, 03 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't use DEPRECATED_DEFINE_STATIC_LOCAL for mutexes
https://bugs.webkit.org/show_bug.cgi?id=136510
Reviewed by Andreas Kling.
Mutexes are intended to be used from multiple threads, and DEPRECATED_DEFINE_STATIC_LOCAL is not thread safe.
* bindings/objc/DOMInternal.mm:
(wrapperCacheLock):
(getDOMWrapper):
(addDOMWrapper):
(removeDOMWrapper):
Use LazyNeverDestroyed + std::call_once, and switch the mutex over to an std::mutex.
* dom/EventListenerMap.cpp:
(WebCore::EventListenerMap::assertNoActiveIterators):
(WebCore::EventListenerIterator::EventListenerIterator):
(WebCore::EventListenerIterator::~EventListenerIterator):
(WebCore::activeIteratorCountMutex):
(WebCore::EventListenerMap::EventListenerMap): Deleted.
* dom/EventListenerMap.h:
Use an std::atomic<int> instead of a mutex here.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMInternalmm">trunk/Source/WebCore/bindings/objc/DOMInternal.mm</a></li>
<li><a href="#trunkSourceWebCoredomEventListenerMapcpp">trunk/Source/WebCore/dom/EventListenerMap.cpp</a></li>
<li><a href="#trunkSourceWebCoredomEventListenerMaph">trunk/Source/WebCore/dom/EventListenerMap.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173239 => 173240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-03 22:55:02 UTC (rev 173239)
+++ trunk/Source/WebCore/ChangeLog 2014-09-03 22:56:48 UTC (rev 173240)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-09-03 Anders Carlsson <andersca@apple.com>
+
+ Don't use DEPRECATED_DEFINE_STATIC_LOCAL for mutexes
+ https://bugs.webkit.org/show_bug.cgi?id=136510
+
+ Reviewed by Andreas Kling.
+
+ Mutexes are intended to be used from multiple threads, and DEPRECATED_DEFINE_STATIC_LOCAL is not thread safe.
+
+ * bindings/objc/DOMInternal.mm:
+ (wrapperCacheLock):
+ (getDOMWrapper):
+ (addDOMWrapper):
+ (removeDOMWrapper):
+ Use LazyNeverDestroyed + std::call_once, and switch the mutex over to an std::mutex.
+
+ * dom/EventListenerMap.cpp:
+ (WebCore::EventListenerMap::assertNoActiveIterators):
+ (WebCore::EventListenerIterator::EventListenerIterator):
+ (WebCore::EventListenerIterator::~EventListenerIterator):
+ (WebCore::activeIteratorCountMutex):
+ (WebCore::EventListenerMap::EventListenerMap): Deleted.
+ * dom/EventListenerMap.h:
+ Use an std::atomic<int> instead of a mutex here.
+
</ins><span class="cx"> 2014-09-03 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove PLATFORM(IOS) from WebCore/editing (Part 1).
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMInternalmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMInternal.mm (173239 => 173240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMInternal.mm 2014-09-03 22:55:02 UTC (rev 173239)
+++ trunk/Source/WebCore/bindings/objc/DOMInternal.mm 2014-09-03 22:56:48 UTC (rev 173240)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #import "ScriptController.h"
</span><span class="cx"> #import "WebScriptObjectPrivate.h"
</span><span class="cx"> #import "runtime_root.h"
</span><ins>+#import <wtf/NeverDestroyed.h>
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #define NEEDS_WRAPPER_CACHE_LOCK 1
</span><span class="lines">@@ -43,10 +44,15 @@
</span><span class="cx"> static NSMapTable* DOMWrapperCache;
</span><span class="cx">
</span><span class="cx"> #ifdef NEEDS_WRAPPER_CACHE_LOCK
</span><del>-static Mutex& wrapperCacheLock()
</del><ins>+static std::mutex& wrapperCacheLock()
</ins><span class="cx"> {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(Mutex, wrapperCacheMutex, ());
- return wrapperCacheMutex;
</del><ins>+ static std::once_flag onceFlag;
+ static LazyNeverDestroyed<std::mutex> mutex;
+
+ std::call_once(onceFlag, [] {
+ mutex.construct();
+ });
+ return mutex;
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -70,7 +76,7 @@
</span><span class="cx"> NSObject* getDOMWrapper(DOMObjectInternal* impl)
</span><span class="cx"> {
</span><span class="cx"> #ifdef NEEDS_WRAPPER_CACHE_LOCK
</span><del>- MutexLocker locker(wrapperCacheLock());
</del><ins>+ std::lock_guard<std::mutex> lock(wrapperCacheLock());
</ins><span class="cx"> #endif
</span><span class="cx"> if (!DOMWrapperCache)
</span><span class="cx"> return nil;
</span><span class="lines">@@ -80,7 +86,7 @@
</span><span class="cx"> void addDOMWrapper(NSObject* wrapper, DOMObjectInternal* impl)
</span><span class="cx"> {
</span><span class="cx"> #ifdef NEEDS_WRAPPER_CACHE_LOCK
</span><del>- MutexLocker locker(wrapperCacheLock());
</del><ins>+ std::lock_guard<std::mutex> lock(wrapperCacheLock());
</ins><span class="cx"> #endif
</span><span class="cx"> if (!DOMWrapperCache)
</span><span class="cx"> DOMWrapperCache = createWrapperCache();
</span><span class="lines">@@ -90,7 +96,7 @@
</span><span class="cx"> void removeDOMWrapper(DOMObjectInternal* impl)
</span><span class="cx"> {
</span><span class="cx"> #ifdef NEEDS_WRAPPER_CACHE_LOCK
</span><del>- MutexLocker locker(wrapperCacheLock());
</del><ins>+ std::lock_guard<std::mutex> lock(wrapperCacheLock());
</ins><span class="cx"> #endif
</span><span class="cx"> if (!DOMWrapperCache)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventListenerMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventListenerMap.cpp (173239 => 173240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventListenerMap.cpp 2014-09-03 22:55:02 UTC (rev 173239)
+++ trunk/Source/WebCore/dom/EventListenerMap.cpp 2014-09-03 22:56:48 UTC (rev 173240)
</span><span class="lines">@@ -37,35 +37,22 @@
</span><span class="cx"> #include "EventException.h"
</span><span class="cx"> #include "EventTarget.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/Vector.h>
</span><span class="cx">
</span><del>-#ifndef NDEBUG
-#include <wtf/Threading.h>
-#endif
-
</del><span class="cx"> using namespace WTF;
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><del>-static Mutex& activeIteratorCountMutex()
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(Mutex, mutex, ());
- return mutex;
-}
-
</del><span class="cx"> void EventListenerMap::assertNoActiveIterators()
</span><span class="cx"> {
</span><del>- MutexLocker locker(activeIteratorCountMutex());
</del><span class="cx"> ASSERT(!m_activeIteratorCount);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> EventListenerMap::EventListenerMap()
</span><del>-#ifndef NDEBUG
- : m_activeIteratorCount(0)
-#endif
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -240,20 +227,15 @@
</span><span class="cx"> m_map = &data->eventListenerMap;
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><del>- {
- MutexLocker locker(activeIteratorCountMutex());
- m_map->m_activeIteratorCount++;
- }
</del><ins>+ m_map->m_activeIteratorCount++;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> EventListenerIterator::~EventListenerIterator()
</span><span class="cx"> {
</span><del>- if (m_map) {
- MutexLocker locker(activeIteratorCountMutex());
</del><ins>+ if (m_map)
</ins><span class="cx"> m_map->m_activeIteratorCount--;
</span><del>- }
</del><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventListenerMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventListenerMap.h (173239 => 173240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventListenerMap.h 2014-09-03 22:55:02 UTC (rev 173239)
+++ trunk/Source/WebCore/dom/EventListenerMap.h 2014-09-03 22:56:48 UTC (rev 173240)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> Vector<std::pair<AtomicString, std::unique_ptr<EventListenerVector>>, 2> m_entries;
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><del>- int m_activeIteratorCount;
</del><ins>+ std::atomic<int> m_activeIteratorCount { 0 };
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>