<!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>[194826] 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/194826">194826</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2016-01-10 05:27:40 -0800 (Sun, 10 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use NeverDestroyed instead of DEPRECATED_DEFINE_STATIC_LOCAL cont'd
<https://webkit.org/b/152902>
Reviewed by Andy Estes.
Source/WebCore:
Convert some more of the remaining clients to use NeverDestroyed.
* html/track/VTTRegion.cpp:
(WebCore::VTTRegion::textTrackCueContainerShadowPseudoId):
(WebCore::VTTRegion::textTrackRegionShadowPseudoId):
* svg/properties/SVGAnimatedPropertyMacros.h:
Source/WebKit:
* Storage/StorageThread.cpp:
(WebCore::activeStorageThreads):
Source/WebKit/ios:
* WebCoreSupport/WebFixedPositionContent.mm:
(WebFixedPositionContentDataLock):
Source/WebKit/mac:
Convert some more of the remaining clients to use NeverDestroyed.
* History/WebBackForwardList.mm:
(backForwardLists):
* History/WebHistoryItem.mm:
(historyItemWrappers):
* Misc/WebNSPasteboardExtras.mm:
(+[NSPasteboard _web_writableTypesForURL]):
(_writableTypesForImageWithoutArchive):
(_writableTypesForImageWithArchive):
* Plugins/Hosted/NetscapePluginHostManager.mm:
(WebKit::NetscapePluginHostManager::singleton):
* Plugins/Hosted/NetscapePluginHostProxy.mm:
(WebKit::pluginProxyMap):
* Plugins/Hosted/NetscapePluginInstanceProxy.mm:
(WebKit::globalExceptionString):
* Plugins/Hosted/ProxyInstance.mm:
(WebKit::proxyClass):
* Plugins/WebNetscapePluginStream.mm:
(streams):
* Storage/WebDatabaseManager.mm:
(transactionBackgroundTaskIdentifierLock):
* WebCoreSupport/WebUserMediaClient.mm:
(userMediaCheckMap):
* WebView/WebHTMLRepresentation.mm:
(regExpForLabels):
* WebView/WebView.mm:
(aeDescFromJSValue):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmltrackVTTRegioncpp">trunk/Source/WebCore/html/track/VTTRegion.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgpropertiesSVGAnimatedPropertyMacrosh">trunk/Source/WebCore/svg/properties/SVGAnimatedPropertyMacros.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitStorageStorageThreadcpp">trunk/Source/WebKit/Storage/StorageThread.cpp</a></li>
<li><a href="#trunkSourceWebKitiosChangeLog">trunk/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitiosWebCoreSupportWebFixedPositionContentmm">trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContent.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebBackForwardListmm">trunk/Source/WebKit/mac/History/WebBackForwardList.mm</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebHistoryItemmm">trunk/Source/WebKit/mac/History/WebHistoryItem.mm</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSPasteboardExtrasmm">trunk/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedNetscapePluginHostManagerh">trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.h</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedNetscapePluginHostManagermm">trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedNetscapePluginHostProxymm">trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedNetscapePluginInstanceProxymm">trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedProxyInstancemm">trunk/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebNetscapePluginStreammm">trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm</a></li>
<li><a href="#trunkSourceWebKitmacStorageWebDatabaseManagermm">trunk/Source/WebKit/mac/Storage/WebDatabaseManager.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebUserMediaClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLRepresentationmm">trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194825 => 194826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-10 06:39:43 UTC (rev 194825)
+++ trunk/Source/WebCore/ChangeLog 2016-01-10 13:27:40 UTC (rev 194826)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-01-10 Andreas Kling <akling@apple.com>
+
+ Use NeverDestroyed instead of DEPRECATED_DEFINE_STATIC_LOCAL cont'd
+ <https://webkit.org/b/152902>
+
+ Reviewed by Andy Estes.
+
+ Convert some more of the remaining clients to use NeverDestroyed.
+
+ * html/track/VTTRegion.cpp:
+ (WebCore::VTTRegion::textTrackCueContainerShadowPseudoId):
+ (WebCore::VTTRegion::textTrackRegionShadowPseudoId):
+ * svg/properties/SVGAnimatedPropertyMacros.h:
+
</ins><span class="cx"> 2016-01-09 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Hook up display-list drawing in GraphicsLayerCA
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackVTTRegioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/VTTRegion.cpp (194825 => 194826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/VTTRegion.cpp 2016-01-10 06:39:43 UTC (rev 194825)
+++ trunk/Source/WebCore/html/track/VTTRegion.cpp 2016-01-10 13:27:40 UTC (rev 194826)
</span><span class="lines">@@ -333,16 +333,14 @@
</span><span class="cx">
</span><span class="cx"> const AtomicString& VTTRegion::textTrackCueContainerShadowPseudoId()
</span><span class="cx"> {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, trackRegionCueContainerPseudoId,
- ("-webkit-media-text-track-region-container", AtomicString::ConstructFromLiteral));
</del><ins>+ static NeverDestroyed<const AtomicString> trackRegionCueContainerPseudoId("-webkit-media-text-track-region-container", AtomicString::ConstructFromLiteral);
</ins><span class="cx">
</span><span class="cx"> return trackRegionCueContainerPseudoId;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const AtomicString& VTTRegion::textTrackRegionShadowPseudoId()
</span><span class="cx"> {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, trackRegionShadowPseudoId,
- ("-webkit-media-text-track-region", AtomicString::ConstructFromLiteral));
</del><ins>+ static NeverDestroyed<const AtomicString> trackRegionShadowPseudoId("-webkit-media-text-track-region", AtomicString::ConstructFromLiteral);
</ins><span class="cx">
</span><span class="cx"> return trackRegionShadowPseudoId;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoresvgpropertiesSVGAnimatedPropertyMacrosh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/properties/SVGAnimatedPropertyMacros.h (194825 => 194826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/properties/SVGAnimatedPropertyMacros.h 2016-01-10 06:39:43 UTC (rev 194825)
+++ trunk/Source/WebCore/svg/properties/SVGAnimatedPropertyMacros.h 2016-01-10 13:27:40 UTC (rev 194826)
</span><span class="lines">@@ -89,14 +89,14 @@
</span><span class="cx"> // Property definition helpers (used in SVG*.cpp files)
</span><span class="cx"> #define DEFINE_ANIMATED_PROPERTY(AnimatedPropertyTypeEnum, OwnerType, DOMAttribute, SVGDOMAttributeIdentifier, UpperProperty, LowerProperty) \
</span><span class="cx"> const SVGPropertyInfo* OwnerType::LowerProperty##PropertyInfo() { \
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(const SVGPropertyInfo, s_propertyInfo, \
</del><ins>+ static NeverDestroyed<const SVGPropertyInfo> s_propertyInfo = SVGPropertyInfo \
</ins><span class="cx"> (AnimatedPropertyTypeEnum, \
</span><span class="cx"> PropertyIsReadWrite, \
</span><span class="cx"> DOMAttribute, \
</span><span class="cx"> SVGDOMAttributeIdentifier, \
</span><span class="cx"> &OwnerType::synchronize##UpperProperty, \
</span><del>- &OwnerType::lookupOrCreate##UpperProperty##Wrapper)); \
- return &s_propertyInfo; \
</del><ins>+ &OwnerType::lookupOrCreate##UpperProperty##Wrapper); \
+ return &s_propertyInfo.get(); \
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Property declaration helpers (used in SVG*.h files)
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (194825 => 194826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2016-01-10 06:39:43 UTC (rev 194825)
+++ trunk/Source/WebKit/ChangeLog 2016-01-10 13:27:40 UTC (rev 194826)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-01-10 Andreas Kling <akling@apple.com>
+
+ Use NeverDestroyed instead of DEPRECATED_DEFINE_STATIC_LOCAL cont'd
+ <https://webkit.org/b/152902>
+
+ Reviewed by Andy Estes.
+
+ * Storage/StorageThread.cpp:
+ (WebCore::activeStorageThreads):
+
</ins><span class="cx"> 2015-12-31 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Replace WTF::move with WTFMove
</span></span></pre></div>
<a id="trunkSourceWebKitStorageStorageThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/StorageThread.cpp (194825 => 194826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/StorageThread.cpp 2016-01-10 06:39:43 UTC (rev 194825)
+++ trunk/Source/WebKit/Storage/StorageThread.cpp 2016-01-10 13:27:40 UTC (rev 194826)
</span><span class="lines">@@ -27,13 +27,14 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/AutodrainedPool.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> static HashSet<StorageThread*>& activeStorageThreads()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(HashSet<StorageThread*>, threads, ());
</del><ins>+ static NeverDestroyed<HashSet<StorageThread*>> threads;
</ins><span class="cx"> return threads;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/ChangeLog (194825 => 194826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/ChangeLog 2016-01-10 06:39:43 UTC (rev 194825)
+++ trunk/Source/WebKit/ios/ChangeLog 2016-01-10 13:27:40 UTC (rev 194826)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-01-10 Andreas Kling <akling@apple.com>
+
+ Use NeverDestroyed instead of DEPRECATED_DEFINE_STATIC_LOCAL cont'd
+ <https://webkit.org/b/152902>
+
+ Reviewed by Andy Estes.
+
+ * WebCoreSupport/WebFixedPositionContent.mm:
+ (WebFixedPositionContentDataLock):
+
</ins><span class="cx"> 2015-12-31 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Replace WTF::move with WTFMove
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebCoreSupportWebFixedPositionContentmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContent.mm (194825 => 194826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContent.mm 2016-01-10 06:39:43 UTC (rev 194825)
+++ trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContent.mm 2016-01-10 13:27:40 UTC (rev 194826)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #import <WebCore/WebCoreThreadRun.h>
</span><span class="cx">
</span><span class="cx"> #import <wtf/HashMap.h>
</span><ins>+#import <wtf/NeverDestroyed.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/StdLibExtras.h>
</span><span class="cx"> #import <wtf/Threading.h>
</span><span class="lines">@@ -50,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> static Lock& WebFixedPositionContentDataLock()
</span><span class="cx"> {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(Lock, mutex, ());
</del><ins>+ static NeverDestroyed<Lock> mutex;
</ins><span class="cx"> return mutex;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (194825 => 194826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-01-10 06:39:43 UTC (rev 194825)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-01-10 13:27:40 UTC (rev 194826)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2016-01-10 Andreas Kling <akling@apple.com>
+
+ Use NeverDestroyed instead of DEPRECATED_DEFINE_STATIC_LOCAL cont'd
+ <https://webkit.org/b/152902>
+
+ Reviewed by Andy Estes.
+
+ Convert some more of the remaining clients to use NeverDestroyed.
+
+ * History/WebBackForwardList.mm:
+ (backForwardLists):
+ * History/WebHistoryItem.mm:
+ (historyItemWrappers):
+ * Misc/WebNSPasteboardExtras.mm:
+ (+[NSPasteboard _web_writableTypesForURL]):
+ (_writableTypesForImageWithoutArchive):
+ (_writableTypesForImageWithArchive):
+ * Plugins/Hosted/NetscapePluginHostManager.mm:
+ (WebKit::NetscapePluginHostManager::singleton):
+ * Plugins/Hosted/NetscapePluginHostProxy.mm:
+ (WebKit::pluginProxyMap):
+ * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
+ (WebKit::globalExceptionString):
+ * Plugins/Hosted/ProxyInstance.mm:
+ (WebKit::proxyClass):
+ * Plugins/WebNetscapePluginStream.mm:
+ (streams):
+ * Storage/WebDatabaseManager.mm:
+ (transactionBackgroundTaskIdentifierLock):
+ * WebCoreSupport/WebUserMediaClient.mm:
+ (userMediaCheckMap):
+ * WebView/WebHTMLRepresentation.mm:
+ (regExpForLabels):
+ * WebView/WebView.mm:
+ (aeDescFromJSValue):
+
</ins><span class="cx"> 2016-01-09 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Allow overriding the frameworks directory independently of using a staging install path
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebBackForwardListmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebBackForwardList.mm (194825 => 194826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebBackForwardList.mm 2016-01-10 06:39:43 UTC (rev 194825)
+++ trunk/Source/WebKit/mac/History/WebBackForwardList.mm 2016-01-10 13:27:40 UTC (rev 194826)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> #import <runtime/InitializeThreading.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><ins>+#import <wtf/NeverDestroyed.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/RunLoop.h>
</span><span class="cx"> #import <wtf/StdLibExtras.h>
</span><span class="lines">@@ -60,7 +61,7 @@
</span><span class="cx"> // with a pointer to a WebBackForwardList in it.
</span><span class="cx"> static BackForwardListMap& backForwardLists()
</span><span class="cx"> {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(BackForwardListMap, staticBackForwardLists, ());
</del><ins>+ static NeverDestroyed<BackForwardListMap> staticBackForwardLists;
</ins><span class="cx"> return staticBackForwardLists;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistoryItemmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistoryItem.mm (194825 => 194826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2016-01-10 06:39:43 UTC (rev 194825)
+++ trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2016-01-10 13:27:40 UTC (rev 194826)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> #import <runtime/InitializeThreading.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><ins>+#import <wtf/NeverDestroyed.h>
</ins><span class="cx"> #import <wtf/RunLoop.h>
</span><span class="cx"> #import <wtf/StdLibExtras.h>
</span><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="lines">@@ -102,7 +103,7 @@
</span><span class="cx">
</span><span class="cx"> static HistoryItemMap& historyItemWrappers()
</span><span class="cx"> {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(HistoryItemMap, historyItemWrappers, ());
</del><ins>+ static NeverDestroyed<HistoryItemMap> historyItemWrappers;
</ins><span class="cx"> return historyItemWrappers;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSPasteboardExtrasmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm (194825 => 194826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm 2016-01-10 06:39:43 UTC (rev 194825)
+++ trunk/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm 2016-01-10 13:27:40 UTC (rev 194826)
</span><span class="lines">@@ -60,14 +60,14 @@
</span><span class="cx">
</span><span class="cx"> + (NSArray *)_web_writableTypesForURL
</span><span class="cx"> {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(RetainPtr<NSArray>, types, ([[NSArray alloc] initWithObjects:
</del><ins>+ static NSArray *types = [[NSArray alloc] initWithObjects:
</ins><span class="cx"> WebURLsWithTitlesPboardType,
</span><span class="cx"> NSURLPboardType,
</span><span class="cx"> WebURLPboardType,
</span><span class="cx"> WebURLNamePboardType,
</span><span class="cx"> NSStringPboardType,
</span><del>- nil]));
- return types.get();
</del><ins>+ nil];
+ return types;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline NSArray *_createWritableTypesForImageWithoutArchive()
</span><span class="lines">@@ -79,8 +79,8 @@
</span><span class="cx">
</span><span class="cx"> static NSArray *_writableTypesForImageWithoutArchive (void)
</span><span class="cx"> {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(RetainPtr<NSArray>, types, (_createWritableTypesForImageWithoutArchive()));
- return types.get();
</del><ins>+ static NSArray *types = _createWritableTypesForImageWithoutArchive();
+ return types;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline NSArray *_createWritableTypesForImageWithArchive()
</span><span class="lines">@@ -93,8 +93,8 @@
</span><span class="cx">
</span><span class="cx"> static NSArray *_writableTypesForImageWithArchive (void)
</span><span class="cx"> {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(RetainPtr<NSArray>, types, (_createWritableTypesForImageWithArchive()));
- return types.get();
</del><ins>+ static NSArray *types = _createWritableTypesForImageWithArchive();
+ return types;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (NSArray *)_web_writableTypesForImageIncludingArchive:(BOOL)hasArchive
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedNetscapePluginHostManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.h (194825 => 194826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.h 2016-01-10 06:39:43 UTC (rev 194825)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.h 2016-01-10 13:27:40 UTC (rev 194826)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #import <wtf/HashMap.h>
</span><span class="cx"> #import <wtf/PassRefPtr.h>
</span><ins>+#import <wtf/NeverDestroyed.h>
</ins><span class="cx"> #import <wtf/text/StringHash.h>
</span><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -53,6 +54,7 @@
</span><span class="cx"> void didCreateWindow();
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ friend class NeverDestroyed<NetscapePluginHostManager>;
</ins><span class="cx"> NetscapePluginHostProxy* hostForPlugin(const String& pluginPath, cpu_type_t pluginArchitecture, const String& bundleIdentifier);
</span><span class="cx">
</span><span class="cx"> NetscapePluginHostManager();
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedNetscapePluginHostManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.mm (194825 => 194826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.mm 2016-01-10 06:39:43 UTC (rev 194825)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.mm 2016-01-10 13:27:40 UTC (rev 194826)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #import <mach/mach_port.h>
</span><span class="cx"> #import <spawn.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><ins>+#import <wtf/NeverDestroyed.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/StdLibExtras.h>
</span><span class="cx">
</span><span class="lines">@@ -51,8 +52,7 @@
</span><span class="cx">
</span><span class="cx"> NetscapePluginHostManager& NetscapePluginHostManager::singleton()
</span><span class="cx"> {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(NetscapePluginHostManager, pluginHostManager, ());
-
</del><ins>+ static NeverDestroyed<NetscapePluginHostManager> pluginHostManager;
</ins><span class="cx"> return pluginHostManager;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedNetscapePluginHostProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm (194825 => 194826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm 2016-01-10 06:39:43 UTC (rev 194825)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm 2016-01-10 13:27:40 UTC (rev 194826)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> #import <WebCore/Frame.h>
</span><span class="cx"> #import <WebCore/IdentifierRep.h>
</span><span class="cx"> #import <WebCore/ScriptController.h>
</span><ins>+#import <wtf/NeverDestroyed.h>
</ins><span class="cx">
</span><span class="cx"> extern "C" {
</span><span class="cx"> #import "WebKitPluginHost.h"
</span><span class="lines">@@ -84,8 +85,7 @@
</span><span class="cx"> typedef HashMap<mach_port_t, NetscapePluginHostProxy*> PluginProxyMap;
</span><span class="cx"> static PluginProxyMap& pluginProxyMap()
</span><span class="cx"> {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(PluginProxyMap, pluginProxyMap, ());
-
</del><ins>+ static NeverDestroyed<PluginProxyMap> pluginProxyMap;
</ins><span class="cx"> return pluginProxyMap;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedNetscapePluginInstanceProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm (194825 => 194826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm 2016-01-10 06:39:43 UTC (rev 194825)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm 2016-01-10 13:27:40 UTC (rev 194826)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> #import <bindings/ScriptValue.h>
</span><span class="cx"> #import <mach/mach.h>
</span><span class="cx"> #import <utility>
</span><ins>+#import <wtf/NeverDestroyed.h>
</ins><span class="cx"> #import <wtf/RefCountedLeakCounter.h>
</span><span class="cx"> #import <wtf/text/CString.h>
</span><span class="cx">
</span><span class="lines">@@ -1663,7 +1664,7 @@
</span><span class="cx">
</span><span class="cx"> static String& globalExceptionString()
</span><span class="cx"> {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(String, exceptionString, ());
</del><ins>+ static NeverDestroyed<String> exceptionString;
</ins><span class="cx"> return exceptionString;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedProxyInstancemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.mm (194825 => 194826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.mm 2016-01-10 06:39:43 UTC (rev 194825)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.mm 2016-01-10 13:27:40 UTC (rev 194826)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #import <runtime/Error.h>
</span><span class="cx"> #import <runtime/FunctionPrototype.h>
</span><span class="cx"> #import <runtime/PropertyNameArray.h>
</span><ins>+#import <wtf/NeverDestroyed.h>
</ins><span class="cx">
</span><span class="cx"> extern "C" {
</span><span class="cx"> #import "WebKitPluginHost.h"
</span><span class="lines">@@ -65,8 +66,8 @@
</span><span class="cx">
</span><span class="cx"> static ProxyClass* proxyClass()
</span><span class="cx"> {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(ProxyClass, proxyClass, ());
- return &proxyClass;
</del><ins>+ static NeverDestroyed<ProxyClass> proxyClass;
+ return &proxyClass.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class ProxyField : public JSC::Bindings::Field {
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebNetscapePluginStreammm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm (194825 => 194826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm 2016-01-10 06:39:43 UTC (rev 194825)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm 2016-01-10 13:27:40 UTC (rev 194826)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx"> #import <runtime/JSLock.h>
</span><span class="cx"> #import <wtf/HashMap.h>
</span><ins>+#import <wtf/NeverDestroyed.h>
</ins><span class="cx"> #import <wtf/StdLibExtras.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -83,7 +84,7 @@
</span><span class="cx"> typedef HashMap<NPStream*, NPP> StreamMap;
</span><span class="cx"> static StreamMap& streams()
</span><span class="cx"> {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(StreamMap, staticStreams, ());
</del><ins>+ static NeverDestroyed<StreamMap> staticStreams;
</ins><span class="cx"> return staticStreams;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacStorageWebDatabaseManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Storage/WebDatabaseManager.mm (194825 => 194826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Storage/WebDatabaseManager.mm 2016-01-10 06:39:43 UTC (rev 194825)
+++ trunk/Source/WebKit/mac/Storage/WebDatabaseManager.mm 2016-01-10 13:27:40 UTC (rev 194826)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx">
</span><span class="cx"> #import <WebCore/DatabaseManager.h>
</span><span class="cx"> #import <WebCore/SecurityOrigin.h>
</span><ins>+#import <wtf/NeverDestroyed.h>
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import "WebDatabaseManagerInternal.h"
</span><span class="lines">@@ -228,7 +229,7 @@
</span><span class="cx">
</span><span class="cx"> static Lock& transactionBackgroundTaskIdentifierLock()
</span><span class="cx"> {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(Lock, mutex, ());
</del><ins>+ static NeverDestroyed<Lock> mutex;
</ins><span class="cx"> return mutex;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebUserMediaClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.mm (194825 => 194826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.mm 2016-01-10 06:39:43 UTC (rev 194825)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.mm 2016-01-10 13:27:40 UTC (rev 194826)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx">
</span><span class="cx"> static UserMediaCheckMap& userMediaCheckMap()
</span><span class="cx"> {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(UserMediaCheckMap, requests, ());
</del><ins>+ static NeverDestroyed<UserMediaCheckMap> requests;
</ins><span class="cx"> return requests;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLRepresentationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm (194825 => 194826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm 2016-01-10 06:39:43 UTC (rev 194825)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm 2016-01-10 13:27:40 UTC (rev 194826)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> #import <WebKitLegacy/DOMHTMLInputElement.h>
</span><span class="cx"> #import <yarr/RegularExpression.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><ins>+#import <wtf/NeverDestroyed.h>
</ins><span class="cx"> #import <wtf/StdLibExtras.h>
</span><span class="cx"> #import <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="lines">@@ -363,15 +364,15 @@
</span><span class="cx"> // that the app will use is equal to the number of locales is used in searching.
</span><span class="cx"> static const unsigned int regExpCacheSize = 4;
</span><span class="cx"> static NSMutableArray* regExpLabels = nil;
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(Vector<RegularExpression*>, regExps, ());
- DEPRECATED_DEFINE_STATIC_LOCAL(RegularExpression, wordRegExp, ("\\w", TextCaseSensitive));
</del><ins>+ static NeverDestroyed<Vector<RegularExpression*>> regExps;
+ static NeverDestroyed<RegularExpression> wordRegExp("\\w", TextCaseSensitive);
</ins><span class="cx">
</span><span class="cx"> RegularExpression* result;
</span><span class="cx"> if (!regExpLabels)
</span><span class="cx"> regExpLabels = [[NSMutableArray alloc] initWithCapacity:regExpCacheSize];
</span><span class="cx"> CFIndex cacheHit = [regExpLabels indexOfObject:labels];
</span><span class="cx"> if (cacheHit != NSNotFound)
</span><del>- result = regExps.at(cacheHit);
</del><ins>+ result = regExps.get().at(cacheHit);
</ins><span class="cx"> else {
</span><span class="cx"> StringBuilder pattern;
</span><span class="cx"> pattern.append('(');
</span><span class="lines">@@ -383,8 +384,8 @@
</span><span class="cx"> bool startsWithWordChar = false;
</span><span class="cx"> bool endsWithWordChar = false;
</span><span class="cx"> if (label.length() != 0) {
</span><del>- startsWithWordChar = wordRegExp.match(label.substring(0, 1)) >= 0;
- endsWithWordChar = wordRegExp.match(label.substring(label.length() - 1, 1)) >= 0;
</del><ins>+ startsWithWordChar = wordRegExp.get().match(label.substring(0, 1)) >= 0;
+ endsWithWordChar = wordRegExp.get().match(label.substring(label.length() - 1, 1)) >= 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (i != 0)
</span><span class="lines">@@ -407,16 +408,16 @@
</span><span class="cx"> if (cacheHit != NSNotFound) {
</span><span class="cx"> // remove from old spot
</span><span class="cx"> [regExpLabels removeObjectAtIndex:cacheHit];
</span><del>- regExps.remove(cacheHit);
</del><ins>+ regExps.get().remove(cacheHit);
</ins><span class="cx"> }
</span><span class="cx"> // add to start
</span><span class="cx"> [regExpLabels insertObject:labels atIndex:0];
</span><del>- regExps.insert(0, result);
</del><ins>+ regExps.get().insert(0, result);
</ins><span class="cx"> // trim if too big
</span><span class="cx"> if ([regExpLabels count] > regExpCacheSize) {
</span><span class="cx"> [regExpLabels removeObjectAtIndex:regExpCacheSize];
</span><del>- RegularExpression* last = regExps.last();
- regExps.removeLast();
</del><ins>+ RegularExpression* last = regExps.get().last();
+ regExps.get().removeLast();
</ins><span class="cx"> delete last;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (194825 => 194826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-01-10 06:39:43 UTC (rev 194825)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-01-10 13:27:40 UTC (rev 194826)
</span><span class="lines">@@ -6806,9 +6806,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> else if (object->inherits(JSArray::info())) {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(HashSet<JSObject*>, visitedElems, ());
- if (!visitedElems.contains(object)) {
- visitedElems.add(object);
</del><ins>+ static NeverDestroyed<HashSet<JSObject*>> visitedElems;
+ if (!visitedElems.get().contains(object)) {
+ visitedElems.get().add(object);
</ins><span class="cx">
</span><span class="cx"> JSArray* array = static_cast<JSArray*>(object);
</span><span class="cx"> aeDesc = [NSAppleEventDescriptor listDescriptor];
</span><span class="lines">@@ -6816,7 +6816,7 @@
</span><span class="cx"> for (unsigned i = 0; i < numItems; ++i)
</span><span class="cx"> [aeDesc insertDescriptor:aeDescFromJSValue(exec, array->get(exec, i)) atIndex:0];
</span><span class="cx">
</span><del>- visitedElems.remove(object);
</del><ins>+ visitedElems.get().remove(object);
</ins><span class="cx"> return aeDesc;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>