webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 4 insertions, 6 deletions

diff --git a/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.h b/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.h
index 872f1eb01..1af7085e2 100644
--- a/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.h
+++ b/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.h
@@ -29,9 +29,9 @@
 #if ENABLE(NETSCAPE_PLUGIN_API)
 
 #include "PluginModuleInfo.h"
-#include <mutex>
 #include <wtf/NeverDestroyed.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/RunLoop.h>
+#include <wtf/glib/GUniquePtr.h>
 
 namespace WebKit {
 
@@ -39,7 +39,7 @@ class PluginInfoCache {
     WTF_MAKE_NONCOPYABLE(PluginInfoCache);
     friend class NeverDestroyed<PluginInfoCache>;
 public:
-    static PluginInfoCache& shared();
+    static PluginInfoCache& singleton();
 
     bool getPluginInfo(const String& pluginPath, PluginModuleInfo&);
     void updatePluginInfo(const String& pluginPath, const PluginModuleInfo&);
@@ -49,13 +49,11 @@ private:
     ~PluginInfoCache();
 
     void saveToFile();
-    static gboolean saveToFileIdleCallback(PluginInfoCache*);
 
     GUniquePtr<GKeyFile> m_cacheFile;
     GUniquePtr<char> m_cachePath;
-    unsigned m_saveToFileIdleId;
+    RunLoop::Timer<PluginInfoCache> m_saveToFileIdle;
     bool m_readOnlyMode;
-    std::mutex m_mutex;
 };
 
 } // namespace WebKit