webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 5 insertions, 2 deletions

diff --git a/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h b/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h
index ec0bdc5df..884ca39f4 100644
--- a/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h
+++ b/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h
@@ -22,9 +22,10 @@
 
 #include "Module.h"
 #include "WKBundle.h"
+#include <wtf/NeverDestroyed.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/Vector.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 typedef struct _WebKitWebExtension WebKitWebExtension;
 
@@ -38,7 +39,7 @@ class WebGtkExtensionManager {
     WTF_MAKE_NONCOPYABLE(WebGtkExtensionManager);
 
 public:
-    WK_EXPORT static WebGtkExtensionManager& shared();
+    WK_EXPORT static WebGtkExtensionManager& singleton();
 
     WK_EXPORT void initialize(WKBundleRef, WKTypeRef);
 
@@ -50,6 +51,8 @@ private:
 
     Vector<Module*> m_extensionModules;
     GRefPtr<WebKitWebExtension> m_extension;
+
+    friend class NeverDestroyed<WebGtkExtensionManager>;
 };
 
 } // namespace WebKit