Changeset 163433 in webkit

Timestamp:

Feb 5, 2014 1:46:25 AM (10 years ago)

Author:

zandobersek@gmail.com

Message:

[GTK] Replace DEFINE_STATIC_LOCAL with NeverDestroyed<T> in GTK WK1 and WK2 code
​https://bugs.webkit.org/show_bug.cgi?id=128195

Reviewed by Martin Robinson.

Use static NeverDestroyed<T> 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:

Location:

trunk/Source

Files:

• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/PlatformStrategiesGtk.cpp (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/PlatformStrategiesGtk.h (modified) (2 diffs)
• WebKit/gtk/webkit/webkitwebsettings.cpp (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/API/gtk/WebKitBackForwardListItem.cpp (modified) (2 diffs)
• WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (modified) (2 diffs)
• WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp (modified) (2 diffs)
• WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp (modified) (1 diff)
• WebKit2/WebProcess/gtk/WebGtkExtensionManager.h (modified) (2 diffs)

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2014-02-05  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK] Replace DEFINE_STATIC_LOCAL with NeverDestroyed<T> in GTK WK1 and WK2 code
+        https://bugs.webkit.org/show_bug.cgi?id=128195
+
+        Reviewed by Martin Robinson.
+
+        Use static NeverDestroyed<T> variables instead of the DEFINE_STATIC_LOCAL macro.
+
+        * WebCoreSupport/PlatformStrategiesGtk.cpp:
+        (PlatformStrategiesGtk::initialize):
+        * WebCoreSupport/PlatformStrategiesGtk.h:
+        * webkit/webkitwebsettings.cpp:
+        (isGoogleDomain):
+
 2014-02-04  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebKit/gtk/WebCoreSupport/PlatformStrategiesGtk.cpp

@@ -31 +31 @@
 void PlatformStrategiesGtk::initialize()
 {
-    DEFINE_STATIC_LOCAL(PlatformStrategiesGtk, platformStrategies, ());
-    setPlatformStrategies(&platformStrategies);
+    static NeverDestroyed<PlatformStrategiesGtk> platformStrategies;
+    setPlatformStrategies(&platformStrategies.get());
 }
 

trunk/Source/WebKit/gtk/WebCoreSupport/PlatformStrategiesGtk.h

@@ -29 +29 @@
 #include "StorageStrategy.h"
 #include "VisitedLinkStrategy.h"
+#include <wtf/NeverDestroyed.h>
 
 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 {
@@ -65 +66 @@
     virtual bool isLinkVisited(WebCore::Page*, WebCore::LinkHash, const WebCore::URL& baseURL, const WTF::AtomicString& attributeURL);
     virtual void addVisitedLink(WebCore::Page*, WebCore::LinkHash);
+
+    friend class NeverDestroyed<PlatformStrategiesGtk>;
 };
 

trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp

@@ -36 +36 @@
 #include "webkitversion.h"
 #include "webkitwebsettingsprivate.h"
+#include <glib/gi18n-lib.h>
+#include <wtf/NeverDestroyed.h>
 #include <wtf/gobject/GUniquePtr.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringConcatenate.h>
-#include <glib/gi18n-lib.h>
 
 /**
@@ -1587 +1588 @@
 static bool isGoogleDomain(String host)
 {
-    DEFINE_STATIC_LOCAL(HashSet<String>, googleDomains, ());
-    DEFINE_STATIC_LOCAL(Vector<String>, otherGoogleDomains, ());
-
-    if (googleDomains.isEmpty())
-        initializeDomainsList(googleDomains);
-
-    if (otherGoogleDomains.isEmpty())
-        initializeOtherGoogleDomains(otherGoogleDomains);
+    static NeverDestroyed<HashSet<String>> googleDomains;
+    static NeverDestroyed<Vector<String>> otherGoogleDomains;
+
+    if (googleDomains.get().isEmpty())
+        initializeDomainsList(googleDomains.get());
+
+    if (otherGoogleDomains.get().isEmpty())
+        initializeOtherGoogleDomains(otherGoogleDomains.get());
 
     // First check if this is one of the various google.com international domains.
     int position = host.find(".google.");
-    if (position > 0 && googleDomains.contains(host.substring(position + sizeof(".google.") - 1)))
+    if (position > 0 && googleDomains.get().contains(host.substring(position + sizeof(".google.") - 1)))
         return true;
 
     // Then we check the possibility of it being one of the other, .com-only google domains.
-    for (unsigned int i = 0; i < otherGoogleDomains.size(); i++) {
-        if (host.endsWith(otherGoogleDomains.at(i)))
+    for (unsigned i = 0; i < otherGoogleDomains.get().size(); i++) {
+        if (host.endsWith(otherGoogleDomains.get().at(i)))
             return true;
     }

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-05  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK] Replace DEFINE_STATIC_LOCAL with NeverDestroyed<T> in GTK WK1 and WK2 code
+        https://bugs.webkit.org/show_bug.cgi?id=128195
+
+        Reviewed by Martin Robinson.
+
+        Use static NeverDestroyed<T> 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:
+
 2014-02-04  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListItem.cpp

@@ -24 +24 @@
 #include "WebKitPrivate.h"
 #include <wtf/HashMap.h>
+#include <wtf/NeverDestroyed.h>
 #include <wtf/gobject/GRefPtr.h>
 #include <wtf/text/CString.h>
@@ -57 +58 @@
 static HistoryItemsMap& historyItemsMap()
 {
-    DEFINE_STATIC_LOCAL(HistoryItemsMap, itemsMap, ());
+    static NeverDestroyed<HistoryItemsMap> itemsMap;
     return itemsMap;
 }

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp

@@ -48 +48 @@
 #include <WebCore/Language.h>
 #include <wtf/HashMap.h>
+#include <wtf/NeverDestroyed.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/PassRefPtr.h>
@@ -358 +359 @@
 static DownloadsMap& downloadsMap()
 {
-    DEFINE_STATIC_LOCAL(DownloadsMap, downloads, ());
+    static NeverDestroyed<DownloadsMap> downloads;
     return downloads;
 }

trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp

@@ -36 +36 @@
 #include <WebCore/UserAgentGtk.h>
 #include <gtk/gtkx.h>
+#include <wtf/NeverDestroyed.h>
 
 namespace WebKit {
@@ -80 +81 @@
 static PluginWindowMap& pluginWindowMap()
 {
-    DEFINE_STATIC_LOCAL(PluginWindowMap, map, ());
+    static NeverDestroyed<PluginWindowMap> map;
     return map;
 }

trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp

@@ -35 +35 @@
 WebGtkExtensionManager& WebGtkExtensionManager::shared()
 {
-    DEFINE_STATIC_LOCAL(WebGtkExtensionManager, extensionManager, ());
+    static NeverDestroyed<WebGtkExtensionManager> extensionManager;
     return extensionManager;
 }

trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h

@@ -23 +23 @@
 #include "Module.h"
 #include "WKBundle.h"
+#include <wtf/NeverDestroyed.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/Vector.h>
@@ -51 +52 @@
     Vector<Module*> m_extensionModules;
     GRefPtr<WebKitWebExtension> m_extension;
+
+    friend class NeverDestroyed<WebGtkExtensionManager>;
 };