<!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>[163433] 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/163433">163433</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-02-05 01:46:25 -0800 (Wed, 05 Feb 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>[GTK] Replace DEFINE_STATIC_LOCAL with NeverDestroyed&lt;T&gt; in GTK WK1 and WK2 code
https://bugs.webkit.org/show_bug.cgi?id=128195

Reviewed by Martin Robinson.

Use static NeverDestroyed&lt;T&gt; variables instead of the DEFINE_STATIC_LOCAL macro.

Source/WebKit/gtk: 

* WebCoreSupport/PlatformStrategiesGtk.cpp:
(PlatformStrategiesGtk::initialize):
* WebCoreSupport/PlatformStrategiesGtk.h:
* webkit/webkitwebsettings.cpp:
(isGoogleDomain):

Source/WebKit2: 

* UIProcess/API/gtk/WebKitBackForwardListItem.cpp:
(historyItemsMap):
* UIProcess/API/gtk/WebKitWebContext.cpp:
(downloadsMap):
* UIProcess/gtk/WebPageProxyGtk.cpp:
(WebKit::pluginWindowMap):
* WebProcess/gtk/WebGtkExtensionManager.cpp:
(WebKit::WebGtkExtensionManager::shared):
* WebProcess/gtk/WebGtkExtensionManager.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitgtkChangeLog">trunk/Source/WebKit/gtk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitgtkWebCoreSupportPlatformStrategiesGtkcpp">trunk/Source/WebKit/gtk/WebCoreSupport/PlatformStrategiesGtk.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkWebCoreSupportPlatformStrategiesGtkh">trunk/Source/WebKit/gtk/WebCoreSupport/PlatformStrategiesGtk.h</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitwebsettingscpp">trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitBackForwardListItemcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListItem.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebPageProxyGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessgtkWebGtkExtensionManagercpp">trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessgtkWebGtkExtensionManagerh">trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitgtkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/ChangeLog (163432 => 163433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/ChangeLog        2014-02-05 09:02:43 UTC (rev 163432)
+++ trunk/Source/WebKit/gtk/ChangeLog        2014-02-05 09:46:25 UTC (rev 163433)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-05  Zan Dobersek  &lt;zdobersek@igalia.com&gt;
+
+        [GTK] Replace DEFINE_STATIC_LOCAL with NeverDestroyed&lt;T&gt; in GTK WK1 and WK2 code
+        https://bugs.webkit.org/show_bug.cgi?id=128195
+
+        Reviewed by Martin Robinson.
+
+        Use static NeverDestroyed&lt;T&gt; variables instead of the DEFINE_STATIC_LOCAL macro.
+
+        * WebCoreSupport/PlatformStrategiesGtk.cpp:
+        (PlatformStrategiesGtk::initialize):
+        * WebCoreSupport/PlatformStrategiesGtk.h:
+        * webkit/webkitwebsettings.cpp:
+        (isGoogleDomain):
+
</ins><span class="cx"> 2014-02-04  Andreas Kling  &lt;akling@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Remove &lt;iframe seamless&gt; support.
</span></span></pre></div>
<a id="trunkSourceWebKitgtkWebCoreSupportPlatformStrategiesGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/WebCoreSupport/PlatformStrategiesGtk.cpp (163432 => 163433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/WebCoreSupport/PlatformStrategiesGtk.cpp        2014-02-05 09:02:43 UTC (rev 163432)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/PlatformStrategiesGtk.cpp        2014-02-05 09:46:25 UTC (rev 163433)
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx"> 
</span><span class="cx"> void PlatformStrategiesGtk::initialize()
</span><span class="cx"> {
</span><del>-    DEFINE_STATIC_LOCAL(PlatformStrategiesGtk, platformStrategies, ());
-    setPlatformStrategies(&amp;platformStrategies);
</del><ins>+    static NeverDestroyed&lt;PlatformStrategiesGtk&gt; platformStrategies;
+    setPlatformStrategies(&amp;platformStrategies.get());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> PlatformStrategiesGtk::PlatformStrategiesGtk()
</span></span></pre></div>
<a id="trunkSourceWebKitgtkWebCoreSupportPlatformStrategiesGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/WebCoreSupport/PlatformStrategiesGtk.h (163432 => 163433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/WebCoreSupport/PlatformStrategiesGtk.h        2014-02-05 09:02:43 UTC (rev 163432)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/PlatformStrategiesGtk.h        2014-02-05 09:46:25 UTC (rev 163433)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include &quot;SharedWorkerStrategy.h&quot;
</span><span class="cx"> #include &quot;StorageStrategy.h&quot;
</span><span class="cx"> #include &quot;VisitedLinkStrategy.h&quot;
</span><ins>+#include &lt;wtf/NeverDestroyed.h&gt;
</ins><span class="cx"> 
</span><span class="cx"> class PlatformStrategiesGtk : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::DatabaseStrategy, private WebCore::LoaderStrategy, private WebCore::PluginStrategy, private WebCore::SharedWorkerStrategy, private WebCore::StorageStrategy, private WebCore::VisitedLinkStrategy {
</span><span class="cx"> public:
</span><span class="lines">@@ -64,6 +65,8 @@
</span><span class="cx">     // WebCore::VisitedLinkStrategy
</span><span class="cx">     virtual bool isLinkVisited(WebCore::Page*, WebCore::LinkHash, const WebCore::URL&amp; baseURL, const WTF::AtomicString&amp; attributeURL);
</span><span class="cx">     virtual void addVisitedLink(WebCore::Page*, WebCore::LinkHash);
</span><ins>+
+    friend class NeverDestroyed&lt;PlatformStrategiesGtk&gt;;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> #endif // PlatformStrategiesGtk_h
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitwebsettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp (163432 => 163433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp        2014-02-05 09:02:43 UTC (rev 163432)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp        2014-02-05 09:46:25 UTC (rev 163433)
</span><span class="lines">@@ -35,10 +35,11 @@
</span><span class="cx"> #include &quot;webkitglobalsprivate.h&quot;
</span><span class="cx"> #include &quot;webkitversion.h&quot;
</span><span class="cx"> #include &quot;webkitwebsettingsprivate.h&quot;
</span><ins>+#include &lt;glib/gi18n-lib.h&gt;
+#include &lt;wtf/NeverDestroyed.h&gt;
</ins><span class="cx"> #include &lt;wtf/gobject/GUniquePtr.h&gt;
</span><span class="cx"> #include &lt;wtf/text/CString.h&gt;
</span><span class="cx"> #include &lt;wtf/text/StringConcatenate.h&gt;
</span><del>-#include &lt;glib/gi18n-lib.h&gt;
</del><span class="cx"> 
</span><span class="cx"> /**
</span><span class="cx">  * SECTION:webkitwebsettings
</span><span class="lines">@@ -1586,23 +1587,23 @@
</span><span class="cx"> 
</span><span class="cx"> static bool isGoogleDomain(String host)
</span><span class="cx"> {
</span><del>-    DEFINE_STATIC_LOCAL(HashSet&lt;String&gt;, googleDomains, ());
-    DEFINE_STATIC_LOCAL(Vector&lt;String&gt;, otherGoogleDomains, ());
</del><ins>+    static NeverDestroyed&lt;HashSet&lt;String&gt;&gt; googleDomains;
+    static NeverDestroyed&lt;Vector&lt;String&gt;&gt; otherGoogleDomains;
</ins><span class="cx"> 
</span><del>-    if (googleDomains.isEmpty())
-        initializeDomainsList(googleDomains);
</del><ins>+    if (googleDomains.get().isEmpty())
+        initializeDomainsList(googleDomains.get());
</ins><span class="cx"> 
</span><del>-    if (otherGoogleDomains.isEmpty())
-        initializeOtherGoogleDomains(otherGoogleDomains);
</del><ins>+    if (otherGoogleDomains.get().isEmpty())
+        initializeOtherGoogleDomains(otherGoogleDomains.get());
</ins><span class="cx"> 
</span><span class="cx">     // First check if this is one of the various google.com international domains.
</span><span class="cx">     int position = host.find(&quot;.google.&quot;);
</span><del>-    if (position &gt; 0 &amp;&amp; googleDomains.contains(host.substring(position + sizeof(&quot;.google.&quot;) - 1)))
</del><ins>+    if (position &gt; 0 &amp;&amp; googleDomains.get().contains(host.substring(position + sizeof(&quot;.google.&quot;) - 1)))
</ins><span class="cx">         return true;
</span><span class="cx"> 
</span><span class="cx">     // Then we check the possibility of it being one of the other, .com-only google domains.
</span><del>-    for (unsigned int i = 0; i &lt; otherGoogleDomains.size(); i++) {
-        if (host.endsWith(otherGoogleDomains.at(i)))
</del><ins>+    for (unsigned i = 0; i &lt; otherGoogleDomains.get().size(); i++) {
+        if (host.endsWith(otherGoogleDomains.get().at(i)))
</ins><span class="cx">             return true;
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163432 => 163433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-02-05 09:02:43 UTC (rev 163432)
+++ trunk/Source/WebKit2/ChangeLog        2014-02-05 09:46:25 UTC (rev 163433)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-02-05  Zan Dobersek  &lt;zdobersek@igalia.com&gt;
+
+        [GTK] Replace DEFINE_STATIC_LOCAL with NeverDestroyed&lt;T&gt; in GTK WK1 and WK2 code
+        https://bugs.webkit.org/show_bug.cgi?id=128195
+
+        Reviewed by Martin Robinson.
+
+        Use static NeverDestroyed&lt;T&gt; variables instead of the DEFINE_STATIC_LOCAL macro.
+
+        * UIProcess/API/gtk/WebKitBackForwardListItem.cpp:
+        (historyItemsMap):
+        * UIProcess/API/gtk/WebKitWebContext.cpp:
+        (downloadsMap):
+        * UIProcess/gtk/WebPageProxyGtk.cpp:
+        (WebKit::pluginWindowMap):
+        * WebProcess/gtk/WebGtkExtensionManager.cpp:
+        (WebKit::WebGtkExtensionManager::shared):
+        * WebProcess/gtk/WebGtkExtensionManager.h:
+
</ins><span class="cx"> 2014-02-04  Andreas Kling  &lt;akling@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Remove &lt;iframe seamless&gt; support.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitBackForwardListItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListItem.cpp (163432 => 163433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListItem.cpp        2014-02-05 09:02:43 UTC (rev 163432)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListItem.cpp        2014-02-05 09:46:25 UTC (rev 163433)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> #include &quot;WebKitBackForwardListPrivate.h&quot;
</span><span class="cx"> #include &quot;WebKitPrivate.h&quot;
</span><span class="cx"> #include &lt;wtf/HashMap.h&gt;
</span><ins>+#include &lt;wtf/NeverDestroyed.h&gt;
</ins><span class="cx"> #include &lt;wtf/gobject/GRefPtr.h&gt;
</span><span class="cx"> #include &lt;wtf/text/CString.h&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -56,7 +57,7 @@
</span><span class="cx"> 
</span><span class="cx"> static HistoryItemsMap&amp; historyItemsMap()
</span><span class="cx"> {
</span><del>-    DEFINE_STATIC_LOCAL(HistoryItemsMap, itemsMap, ());
</del><ins>+    static NeverDestroyed&lt;HistoryItemsMap&gt; itemsMap;
</ins><span class="cx">     return itemsMap;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (163432 => 163433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp        2014-02-05 09:02:43 UTC (rev 163432)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp        2014-02-05 09:46:25 UTC (rev 163433)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> #include &lt;WebCore/IconDatabase.h&gt;
</span><span class="cx"> #include &lt;WebCore/Language.h&gt;
</span><span class="cx"> #include &lt;wtf/HashMap.h&gt;
</span><ins>+#include &lt;wtf/NeverDestroyed.h&gt;
</ins><span class="cx"> #include &lt;wtf/OwnPtr.h&gt;
</span><span class="cx"> #include &lt;wtf/PassRefPtr.h&gt;
</span><span class="cx"> #include &lt;wtf/RefCounted.h&gt;
</span><span class="lines">@@ -357,7 +358,7 @@
</span><span class="cx"> 
</span><span class="cx"> static DownloadsMap&amp; downloadsMap()
</span><span class="cx"> {
</span><del>-    DEFINE_STATIC_LOCAL(DownloadsMap, downloads, ());
</del><ins>+    static NeverDestroyed&lt;DownloadsMap&gt; downloads;
</ins><span class="cx">     return downloads;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebPageProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp (163432 => 163433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp        2014-02-05 09:02:43 UTC (rev 163432)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp        2014-02-05 09:46:25 UTC (rev 163433)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include &quot;WebProcessProxy.h&quot;
</span><span class="cx"> #include &lt;WebCore/UserAgentGtk.h&gt;
</span><span class="cx"> #include &lt;gtk/gtkx.h&gt;
</span><ins>+#include &lt;wtf/NeverDestroyed.h&gt;
</ins><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> 
</span><span class="lines">@@ -79,7 +80,7 @@
</span><span class="cx"> typedef HashMap&lt;uint64_t, GtkWidget* &gt; PluginWindowMap;
</span><span class="cx"> static PluginWindowMap&amp; pluginWindowMap()
</span><span class="cx"> {
</span><del>-    DEFINE_STATIC_LOCAL(PluginWindowMap, map, ());
</del><ins>+    static NeverDestroyed&lt;PluginWindowMap&gt; map;
</ins><span class="cx">     return map;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessgtkWebGtkExtensionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp (163432 => 163433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp        2014-02-05 09:02:43 UTC (rev 163432)
+++ trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp        2014-02-05 09:46:25 UTC (rev 163433)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> 
</span><span class="cx"> WebGtkExtensionManager&amp; WebGtkExtensionManager::shared()
</span><span class="cx"> {
</span><del>-    DEFINE_STATIC_LOCAL(WebGtkExtensionManager, extensionManager, ());
</del><ins>+    static NeverDestroyed&lt;WebGtkExtensionManager&gt; extensionManager;
</ins><span class="cx">     return extensionManager;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessgtkWebGtkExtensionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h (163432 => 163433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h        2014-02-05 09:02:43 UTC (rev 163432)
+++ trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h        2014-02-05 09:46:25 UTC (rev 163433)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include &quot;Module.h&quot;
</span><span class="cx"> #include &quot;WKBundle.h&quot;
</span><ins>+#include &lt;wtf/NeverDestroyed.h&gt;
</ins><span class="cx"> #include &lt;wtf/Noncopyable.h&gt;
</span><span class="cx"> #include &lt;wtf/Vector.h&gt;
</span><span class="cx"> #include &lt;wtf/gobject/GRefPtr.h&gt;
</span><span class="lines">@@ -50,6 +51,8 @@
</span><span class="cx"> 
</span><span class="cx">     Vector&lt;Module*&gt; m_extensionModules;
</span><span class="cx">     GRefPtr&lt;WebKitWebExtension&gt; m_extension;
</span><ins>+
+    friend class NeverDestroyed&lt;WebGtkExtensionManager&gt;;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>

</body>
</html>