<!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>[169518] 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/169518">169518</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-01 15:31:13 -0700 (Sun, 01 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a LazyNeverDestroyed class template and use it
https://bugs.webkit.org/show_bug.cgi?id=133425
Reviewed by Darin Adler.
Source/JavaScriptCore:
* dfg/DFGFunctionWhitelist.cpp:
(JSC::DFG::FunctionWhitelist::ensureGlobalWhitelist):
* dfg/DFGFunctionWhitelist.h:
Source/WebCore:
* Modules/webdatabase/DatabaseBackendBase.cpp:
(WebCore::guidMutex):
* crypto/CryptoAlgorithmRegistry.cpp:
(WebCore::registryMutex):
* inspector/WorkerDebuggerAgent.cpp:
* loader/CrossOriginAccessControl.cpp:
(WebCore::isOnAccessControlResponseHeaderWhitelist):
* platform/network/NetworkStateNotifier.cpp:
(WebCore::networkStateNotifier):
* workers/DefaultSharedWorkerRepository.cpp:
(WebCore::DefaultSharedWorkerRepository::instance):
* workers/DefaultSharedWorkerRepository.h:
* workers/WorkerThread.cpp:
(WebCore::threadSetMutex):
* xml/XMLHttpRequest.cpp:
(WebCore::staticData):
Source/WebKit2:
* Shared/mac/SecItemShim.cpp:
(WebKit::responseMap):
Source/WTF:
LazyNeverDestroyed is similar to NeverDestroyed, except it's lazily constructed
by calling construct(). This makes it useful for using inside std::call_once functions.
* wtf/Forward.h:
* wtf/NeverDestroyed.h:
(WTF::LazyNeverDestroyed::construct):
(WTF::LazyNeverDestroyed::operator T&):
(WTF::LazyNeverDestroyed::get):
(WTF::LazyNeverDestroyed::asPtr):
(WTF::LazyNeverDestroyed::MaybeRelax::MaybeRelax):
* wtf/mac/DeprecatedSymbolsUsedBySafari.mm:
(WTF::atomicallyInitializedStaticMutex):
* wtf/unicode/icu/CollatorICU.cpp:
(WTF::cachedCollatorMutex):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGFunctionWhitelistcpp">trunk/Source/JavaScriptCore/dfg/DFGFunctionWhitelist.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGFunctionWhitelisth">trunk/Source/JavaScriptCore/dfg/DFGFunctionWhitelist.h</a></li>
<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="#trunkSourceWTFwtfNeverDestroyedh">trunk/Source/WTF/wtf/NeverDestroyed.h</a></li>
<li><a href="#trunkSourceWTFwtfmacDeprecatedSymbolsUsedBySafarimm">trunk/Source/WTF/wtf/mac/DeprecatedSymbolsUsedBySafari.mm</a></li>
<li><a href="#trunkSourceWTFwtfunicodeicuCollatorICUcpp">trunk/Source/WTF/wtf/unicode/icu/CollatorICU.cpp</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBasecpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoCryptoAlgorithmRegistrycpp">trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerDebuggerAgentcpp">trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderCrossOriginAccessControlcpp">trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkNetworkStateNotifiercpp">trunk/Source/WebCore/platform/network/NetworkStateNotifier.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersDefaultSharedWorkerRepositorycpp">trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersDefaultSharedWorkerRepositoryh">trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerThreadcpp">trunk/Source/WebCore/workers/WorkerThread.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacSecItemShimcpp">trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (169517 => 169518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-06-01 21:12:00 UTC (rev 169517)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-06-01 22:31:13 UTC (rev 169518)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-05-31 Anders Carlsson <andersca@apple.com>
+
+ Add a LazyNeverDestroyed class template and use it
+ https://bugs.webkit.org/show_bug.cgi?id=133425
+
+ Reviewed by Darin Adler.
+
+ * dfg/DFGFunctionWhitelist.cpp:
+ (JSC::DFG::FunctionWhitelist::ensureGlobalWhitelist):
+ * dfg/DFGFunctionWhitelist.h:
+
</ins><span class="cx"> 2014-05-28 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> DFG::DCEPhase inserts into an insertion set in reverse, causing hilarious basic block corruption if you kill a lot of NewArrays
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGFunctionWhitelistcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGFunctionWhitelist.cpp (169517 => 169518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGFunctionWhitelist.cpp 2014-06-01 21:12:00 UTC (rev 169517)
+++ trunk/Source/JavaScriptCore/dfg/DFGFunctionWhitelist.cpp 2014-06-01 22:31:13 UTC (rev 169518)
</span><span class="lines">@@ -30,19 +30,20 @@
</span><span class="cx"> #include "Options.h"
</span><span class="cx"> #include <stdio.h>
</span><span class="cx"> #include <string.h>
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="cx"> namespace JSC { namespace DFG {
</span><span class="cx">
</span><del>-static FunctionWhitelist* functionWhitelist;
-
</del><span class="cx"> FunctionWhitelist& FunctionWhitelist::ensureGlobalWhitelist()
</span><span class="cx"> {
</span><ins>+ static LazyNeverDestroyed<FunctionWhitelist> functionWhitelist;
</ins><span class="cx"> static std::once_flag initializeWhitelistFlag;
</span><span class="cx"> std::call_once(initializeWhitelistFlag, [] {
</span><del>- functionWhitelist = new FunctionWhitelist(Options::dfgFunctionWhitelistFile());
</del><ins>+ const char* functionWhitelistFile = Options::dfgFunctionWhitelistFile();
+ functionWhitelist.construct(functionWhitelistFile);
</ins><span class="cx"> });
</span><del>- return *functionWhitelist;
</del><ins>+ return functionWhitelist;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FunctionWhitelist::FunctionWhitelist(const char* filename)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGFunctionWhitelisth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGFunctionWhitelist.h (169517 => 169518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGFunctionWhitelist.h 2014-06-01 21:12:00 UTC (rev 169517)
+++ trunk/Source/JavaScriptCore/dfg/DFGFunctionWhitelist.h 2014-06-01 22:31:13 UTC (rev 169518)
</span><span class="lines">@@ -38,11 +38,11 @@
</span><span class="cx"> class FunctionWhitelist {
</span><span class="cx"> public:
</span><span class="cx"> static FunctionWhitelist& ensureGlobalWhitelist();
</span><ins>+ explicit FunctionWhitelist(const char*);
</ins><span class="cx">
</span><span class="cx"> bool contains(CodeBlock*) const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- FunctionWhitelist(const char*);
</del><span class="cx"> void parseFunctionNamesInFile(const char*);
</span><span class="cx">
</span><span class="cx"> HashSet<String> m_entries;
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (169517 => 169518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-06-01 21:12:00 UTC (rev 169517)
+++ trunk/Source/WTF/ChangeLog 2014-06-01 22:31:13 UTC (rev 169518)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-05-31 Anders Carlsson <andersca@apple.com>
+
+ Add a LazyNeverDestroyed class template and use it
+ https://bugs.webkit.org/show_bug.cgi?id=133425
+
+ Reviewed by Darin Adler.
+
+ LazyNeverDestroyed is similar to NeverDestroyed, except it's lazily constructed
+ by calling construct(). This makes it useful for using inside std::call_once functions.
+
+ * wtf/Forward.h:
+ * wtf/NeverDestroyed.h:
+ (WTF::LazyNeverDestroyed::construct):
+ (WTF::LazyNeverDestroyed::operator T&):
+ (WTF::LazyNeverDestroyed::get):
+ (WTF::LazyNeverDestroyed::asPtr):
+ (WTF::LazyNeverDestroyed::MaybeRelax::MaybeRelax):
+ * wtf/mac/DeprecatedSymbolsUsedBySafari.mm:
+ (WTF::atomicallyInitializedStaticMutex):
+ * wtf/unicode/icu/CollatorICU.cpp:
+ (WTF::cachedCollatorMutex):
+
</ins><span class="cx"> 2014-05-29 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Enable css jit by default on arm64.
</span></span></pre></div>
<a id="trunkSourceWTFwtfForwardh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Forward.h (169517 => 169518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Forward.h 2014-06-01 21:12:00 UTC (rev 169517)
+++ trunk/Source/WTF/wtf/Forward.h 2014-06-01 22:31:13 UTC (rev 169518)
</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 LazyNeverDestroyed;
</ins><span class="cx"> template<typename T> class NeverDestroyed;
</span><span class="cx"> template<typename T> class OwnPtr;
</span><span class="cx"> template<typename T> class PassOwnPtr;
</span><span class="lines">@@ -60,6 +61,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::LazyNeverDestroyed;
</ins><span class="cx"> using WTF::NeverDestroyed;
</span><span class="cx"> using WTF::OwnPtr;
</span><span class="cx"> using WTF::PassOwnPtr;
</span></span></pre></div>
<a id="trunkSourceWTFwtfNeverDestroyedh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/NeverDestroyed.h (169517 => 169518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/NeverDestroyed.h 2014-06-01 21:12:00 UTC (rev 169517)
+++ trunk/Source/WTF/wtf/NeverDestroyed.h 2014-06-01 22:31:13 UTC (rev 169518)
</span><span class="lines">@@ -73,8 +73,56 @@
</span><span class="cx"> };
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<typename T> class LazyNeverDestroyed {
+ WTF_MAKE_NONCOPYABLE(LazyNeverDestroyed);
+
+public:
+ LazyNeverDestroyed() = default;
+
+ template<typename... Args>
+ void construct(Args&&... args)
+ {
+ ASSERT(!m_isConstructed);
+
+#if !ASSERT_DISABLED
+ m_isConstructed = true;
+#endif
+
+ MaybeRelax<T>(new (asPtr()) T(std::forward<Args>(args)...));
+ }
+
+ operator T&() { return *asPtr(); }
+ T& get() { return *asPtr(); }
+
+private:
+ typedef typename std::remove_const<T>::type* PointerType;
+
+ PointerType asPtr()
+ {
+ ASSERT(m_isConstructed);
+
+ return reinterpret_cast<PointerType>(&m_storage);
+ }
+
+ // FIXME: Investigate whether we should allocate a hunk of virtual memory
+ // and hand out chunks of it to NeverDestroyed instead, to reduce fragmentation.
+ typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type m_storage;
+
+ template <typename PtrType, bool ShouldRelax = std::is_base_of<RefCounted<PtrType>, PtrType>::value> struct MaybeRelax {
+ explicit MaybeRelax(PtrType*) { }
+ };
+ template <typename PtrType> struct MaybeRelax<PtrType, true> {
+ explicit MaybeRelax(PtrType* ptr) { ptr->relaxAdoptionRequirement(); }
+ };
+
+#if !ASSERT_DISABLED
+ bool m_isConstructed = false;
+#endif
+};
+
</ins><span class="cx"> } // namespace WTF;
</span><span class="cx">
</span><ins>+using WTF::LazyNeverDestroyed;
</ins><span class="cx"> using WTF::NeverDestroyed;
</span><span class="cx">
</span><span class="cx"> #endif // NeverDestroyed_h
</span></span></pre></div>
<a id="trunkSourceWTFwtfmacDeprecatedSymbolsUsedBySafarimm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/mac/DeprecatedSymbolsUsedBySafari.mm (169517 => 169518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/mac/DeprecatedSymbolsUsedBySafari.mm 2014-06-01 21:12:00 UTC (rev 169517)
+++ trunk/Source/WTF/wtf/mac/DeprecatedSymbolsUsedBySafari.mm 2014-06-01 22:31:13 UTC (rev 169518)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #include "Functional.h"
</span><span class="cx"> #include "MainThread.h"
</span><ins>+#include "NeverDestroyed.h"
</ins><span class="cx"> #include "StdLibExtras.h"
</span><span class="cx"> #include <mutex>
</span><span class="cx">
</span><span class="lines">@@ -47,12 +48,12 @@
</span><span class="cx"> static std::mutex& atomicallyInitializedStaticMutex()
</span><span class="cx"> {
</span><span class="cx"> static std::once_flag onceFlag;
</span><del>- static std::mutex* mutex;
</del><ins>+ static LazyNeverDestroyed<std::mutex> mutex;
</ins><span class="cx"> std::call_once(onceFlag, []{
</span><del>- mutex = std::make_unique<std::mutex>().release();
</del><ins>+ mutex.construct();
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- return *mutex;
</del><ins>+ return mutex;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void lockAtomicallyInitializedStaticMutex()
</span></span></pre></div>
<a id="trunkSourceWTFwtfunicodeicuCollatorICUcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/unicode/icu/CollatorICU.cpp (169517 => 169518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/unicode/icu/CollatorICU.cpp 2014-06-01 21:12:00 UTC (rev 169517)
+++ trunk/Source/WTF/wtf/unicode/icu/CollatorICU.cpp 2014-06-01 22:31:13 UTC (rev 169518)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx">
</span><span class="cx"> #include <mutex>
</span><span class="cx"> #include <unicode/ucol.h>
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx"> #include <wtf/StringExtras.h>
</span><span class="cx"> #include <wtf/text/StringView.h>
</span><span class="cx">
</span><span class="lines">@@ -52,11 +53,13 @@
</span><span class="cx"> static std::mutex& cachedCollatorMutex()
</span><span class="cx"> {
</span><span class="cx"> static std::once_flag onceFlag;
</span><del>- static std::mutex* mutex;
</del><ins>+
+ static LazyNeverDestroyed<std::mutex> mutex;
</ins><span class="cx"> std::call_once(onceFlag, []{
</span><del>- mutex = std::make_unique<std::mutex>().release();
</del><ins>+ mutex.construct();
</ins><span class="cx"> });
</span><del>- return *mutex;
</del><ins>+
+ return mutex;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !(OS(DARWIN) && USE(CF))
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169517 => 169518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-01 21:12:00 UTC (rev 169517)
+++ trunk/Source/WebCore/ChangeLog 2014-06-01 22:31:13 UTC (rev 169518)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-05-31 Anders Carlsson <andersca@apple.com>
+
+ Add a LazyNeverDestroyed class template and use it
+ https://bugs.webkit.org/show_bug.cgi?id=133425
+
+ Reviewed by Darin Adler.
+
+ * Modules/webdatabase/DatabaseBackendBase.cpp:
+ (WebCore::guidMutex):
+ * crypto/CryptoAlgorithmRegistry.cpp:
+ (WebCore::registryMutex):
+ * inspector/WorkerDebuggerAgent.cpp:
+ * loader/CrossOriginAccessControl.cpp:
+ (WebCore::isOnAccessControlResponseHeaderWhitelist):
+ * platform/network/NetworkStateNotifier.cpp:
+ (WebCore::networkStateNotifier):
+ * workers/DefaultSharedWorkerRepository.cpp:
+ (WebCore::DefaultSharedWorkerRepository::instance):
+ * workers/DefaultSharedWorkerRepository.h:
+ * workers/WorkerThread.cpp:
+ (WebCore::threadSetMutex):
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::staticData):
+
</ins><span class="cx"> 2014-06-01 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Subpixel rendering: Selection gap produces a pixel line overlap on inline boxes.
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp (169517 => 169518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp 2014-06-01 21:12:00 UTC (rev 169517)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp 2014-06-01 22:31:13 UTC (rev 169518)
</span><span class="lines">@@ -141,13 +141,13 @@
</span><span class="cx"> static std::mutex& guidMutex()
</span><span class="cx"> {
</span><span class="cx"> static std::once_flag onceFlag;
</span><del>- static std::mutex* mutex;
</del><ins>+ static LazyNeverDestroyed<std::mutex> mutex;
</ins><span class="cx">
</span><span class="cx"> std::call_once(onceFlag, []{
</span><del>- mutex = std::make_unique<std::mutex>().release();
</del><ins>+ mutex.construct();
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- return *mutex;
</del><ins>+ return mutex;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> typedef HashMap<DatabaseGuid, String> GuidVersionMap;
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoCryptoAlgorithmRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp (169517 => 169518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp 2014-06-01 21:12:00 UTC (rev 169517)
+++ trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp 2014-06-01 22:31:13 UTC (rev 169518)
</span><span class="lines">@@ -44,13 +44,13 @@
</span><span class="cx"> static std::mutex& registryMutex()
</span><span class="cx"> {
</span><span class="cx"> static std::once_flag onceFlag;
</span><del>- static std::mutex* mutex;
</del><ins>+ static LazyNeverDestroyed<std::mutex> mutex;
</ins><span class="cx">
</span><span class="cx"> std::call_once(onceFlag, []{
</span><del>- mutex = std::make_unique<std::mutex>().release();
</del><ins>+ mutex.construct();
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- return *mutex;
</del><ins>+ return mutex;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CryptoAlgorithmRegistry::CryptoAlgorithmRegistry()
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp (169517 => 169518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp 2014-06-01 21:12:00 UTC (rev 169517)
+++ trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp 2014-06-01 22:31:13 UTC (rev 169518)
</span><span class="lines">@@ -51,13 +51,13 @@
</span><span class="cx"> std::mutex& workerDebuggerAgentsMutex()
</span><span class="cx"> {
</span><span class="cx"> static std::once_flag onceFlag;
</span><del>- static std::mutex* mutex;
</del><ins>+ static LazyNeverDestroyed<std::mutex> mutex;
</ins><span class="cx">
</span><span class="cx"> std::call_once(onceFlag, []{
</span><del>- mutex = std::make_unique<std::mutex>().release();
</del><ins>+ mutex.construct();
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- return *mutex;
</del><ins>+ return mutex;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> typedef HashMap<WorkerThread*, WorkerDebuggerAgent*> WorkerDebuggerAgents;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderCrossOriginAccessControlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp (169517 => 169518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp 2014-06-01 21:12:00 UTC (rev 169517)
+++ trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp 2014-06-01 22:31:13 UTC (rev 169518)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "ResourceResponse.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include <mutex>
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx"> #include <wtf/text/AtomicString.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="lines">@@ -78,20 +79,20 @@
</span><span class="cx"> bool isOnAccessControlResponseHeaderWhitelist(const String& name)
</span><span class="cx"> {
</span><span class="cx"> static std::once_flag onceFlag;
</span><del>- static HTTPHeaderSet* allowedCrossOriginResponseHeaders;
</del><ins>+ static LazyNeverDestroyed<HTTPHeaderSet> allowedCrossOriginResponseHeaders;
</ins><span class="cx">
</span><span class="cx"> std::call_once(onceFlag, []{
</span><del>- allowedCrossOriginResponseHeaders = std::make_unique<HTTPHeaderSet, std::initializer_list<String>>({
</del><ins>+ allowedCrossOriginResponseHeaders.construct<std::initializer_list<String>>({
</ins><span class="cx"> "cache-control",
</span><span class="cx"> "content-language",
</span><span class="cx"> "content-type",
</span><span class="cx"> "expires",
</span><span class="cx"> "last-modified",
</span><span class="cx"> "pragma"
</span><del>- }).release();
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- return allowedCrossOriginResponseHeaders->contains(name);
</del><ins>+ return allowedCrossOriginResponseHeaders.get().contains(name);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void updateRequestForAccessControl(ResourceRequest& request, SecurityOrigin* securityOrigin, StoredCredentials allowCredentials)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkNetworkStateNotifiercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/NetworkStateNotifier.cpp (169517 => 169518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/NetworkStateNotifier.cpp 2014-06-01 21:12:00 UTC (rev 169517)
+++ trunk/Source/WebCore/platform/network/NetworkStateNotifier.cpp 2014-06-01 22:31:13 UTC (rev 169518)
</span><span class="lines">@@ -32,20 +32,20 @@
</span><span class="cx">
</span><span class="cx"> #include <mutex>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><del>-#include <wtf/StdLibExtras.h>
</del><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> NetworkStateNotifier& networkStateNotifier()
</span><span class="cx"> {
</span><span class="cx"> static std::once_flag onceFlag;
</span><del>- static NetworkStateNotifier* networkStateNotifier;
</del><ins>+ static LazyNeverDestroyed<NetworkStateNotifier> networkStateNotifier;
</ins><span class="cx">
</span><span class="cx"> std::call_once(onceFlag, []{
</span><del>- networkStateNotifier = std::make_unique<NetworkStateNotifier>().release();
</del><ins>+ networkStateNotifier.construct();
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- return *networkStateNotifier;
</del><ins>+ return networkStateNotifier;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkStateNotifier::addNetworkStateChangeListener(std::function<void (bool)> listener)
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersDefaultSharedWorkerRepositorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp (169517 => 169518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp 2014-06-01 21:12:00 UTC (rev 169517)
+++ trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp 2014-06-01 22:31:13 UTC (rev 169518)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> #include <inspector/ScriptCallStack.h>
</span><span class="cx"> #include <mutex>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx"> #include <wtf/Threading.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -331,12 +332,12 @@
</span><span class="cx"> DefaultSharedWorkerRepository& DefaultSharedWorkerRepository::instance()
</span><span class="cx"> {
</span><span class="cx"> static std::once_flag onceFlag;
</span><del>- static DefaultSharedWorkerRepository* instance;
</del><ins>+ static LazyNeverDestroyed<DefaultSharedWorkerRepository> instance;
</ins><span class="cx"> std::call_once(onceFlag, []{
</span><del>- instance = new DefaultSharedWorkerRepository;
</del><ins>+ instance.construct();
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- return *instance;
</del><ins>+ return instance;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool DefaultSharedWorkerRepository::isAvailable()
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersDefaultSharedWorkerRepositoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.h (169517 => 169518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.h 2014-06-01 21:12:00 UTC (rev 169517)
+++ trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.h 2014-06-01 22:31:13 UTC (rev 169518)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx"> // Platform-specific implementation of the SharedWorkerRepository static interface.
</span><span class="cx"> class DefaultSharedWorkerRepository {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(DefaultSharedWorkerRepository); WTF_MAKE_FAST_ALLOCATED;
</span><ins>+
</ins><span class="cx"> public:
</span><span class="cx"> // Returns true if the platform supports SharedWorkers, otherwise false.
</span><span class="cx"> static bool isAvailable();
</span><span class="lines">@@ -76,8 +77,9 @@
</span><span class="cx"> bool hasSharedWorkers(Document*);
</span><span class="cx">
</span><span class="cx"> static DefaultSharedWorkerRepository& instance();
</span><ins>+ DefaultSharedWorkerRepository();
+
</ins><span class="cx"> private:
</span><del>- DefaultSharedWorkerRepository();
</del><span class="cx"> ~DefaultSharedWorkerRepository();
</span><span class="cx">
</span><span class="cx"> PassRefPtr<SharedWorkerProxy> getProxy(const String& name, const URL&);
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerThread.cpp (169517 => 169518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerThread.cpp 2014-06-01 21:12:00 UTC (rev 169517)
+++ trunk/Source/WebCore/workers/WorkerThread.cpp 2014-06-01 22:31:13 UTC (rev 169518)
</span><span class="lines">@@ -54,13 +54,13 @@
</span><span class="cx"> static std::mutex& threadSetMutex()
</span><span class="cx"> {
</span><span class="cx"> static std::once_flag onceFlag;
</span><del>- static std::mutex* mutex;
</del><ins>+ static LazyNeverDestroyed<std::mutex> mutex;
</ins><span class="cx">
</span><span class="cx"> std::call_once(onceFlag, []{
</span><del>- mutex = std::make_unique<std::mutex>().release();
</del><ins>+ mutex.construct();
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- return *mutex;
</del><ins>+ return mutex;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static HashSet<WorkerThread*>& workerThreads()
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (169517 => 169518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-06-01 21:12:00 UTC (rev 169517)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-06-01 22:31:13 UTC (rev 169518)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> #include <runtime/ArrayBufferView.h>
</span><span class="cx"> #include <runtime/JSCInlines.h>
</span><span class="cx"> #include <runtime/JSLock.h>
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx"> #include <wtf/RefCountedLeakCounter.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="lines">@@ -118,13 +119,13 @@
</span><span class="cx"> static const XMLHttpRequestStaticData& staticData()
</span><span class="cx"> {
</span><span class="cx"> static std::once_flag onceFlag;
</span><del>- static const XMLHttpRequestStaticData* staticData;
</del><ins>+ static LazyNeverDestroyed<XMLHttpRequestStaticData> staticData;
</ins><span class="cx">
</span><span class="cx"> std::call_once(onceFlag, [] {
</span><del>- staticData = std::make_unique<XMLHttpRequestStaticData>().release();
</del><ins>+ staticData.construct();
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- return *staticData;
</del><ins>+ return staticData;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool isSetCookieHeader(const AtomicString& name)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169517 => 169518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-01 21:12:00 UTC (rev 169517)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-01 22:31:13 UTC (rev 169518)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-05-31 Anders Carlsson <andersca@apple.com>
+
+ Add a LazyNeverDestroyed class template and use it
+ https://bugs.webkit.org/show_bug.cgi?id=133425
+
+ Reviewed by Darin Adler.
+
+ * Shared/mac/SecItemShim.cpp:
+ (WebKit::responseMap):
+
</ins><span class="cx"> 2014-05-31 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> View snapshots are sometimes taken at the wrong scale
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacSecItemShimcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp (169517 => 169518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp 2014-06-01 21:12:00 UTC (rev 169517)
+++ trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp 2014-06-01 22:31:13 UTC (rev 169518)
</span><span class="lines">@@ -39,19 +39,20 @@
</span><span class="cx"> #include <atomic>
</span><span class="cx"> #include <dlfcn.h>
</span><span class="cx"> #include <mutex>
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> static BlockingResponseMap<SecItemResponseData>& responseMap()
</span><span class="cx"> {
</span><span class="cx"> static std::once_flag onceFlag;
</span><del>- static BlockingResponseMap<SecItemResponseData>* responseMap;
</del><ins>+ static LazyNeverDestroyed<BlockingResponseMap<SecItemResponseData>> responseMap;
</ins><span class="cx">
</span><span class="cx"> std::call_once(onceFlag, []{
</span><del>- responseMap = std::make_unique<BlockingResponseMap<SecItemResponseData>>().release();
</del><ins>+ responseMap.construct();
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- return *responseMap;
</del><ins>+ return responseMap;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static ChildProcess* sharedProcess;
</span></span></pre>
</div>
</div>
</body>
</html>