Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

1 files changed, 18 insertions, 2 deletions

diff --git a/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h b/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h
index a245b11..aee26bb 100644
--- a/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h
+++ b/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h
@@ -28,7 +28,7 @@
 
 #include "Module.h"
 #include "PluginQuirks.h"
-#include <WebCore/npfunctions.h>
+#include <WebCore/npruntime_internal.h>
 #include <wtf/RefCounted.h>
 #include <wtf/text/WTFString.h>
 
@@ -53,11 +53,27 @@ public:
 
     const PluginQuirks& pluginQuirks() const { return m_pluginQuirks; }
 
+    // Return a list of domains for which the plug-in has data stored.
+    Vector<String> sitesWithData();
+
+    // Request that the plug-in clear the site data.
+    bool clearSiteData(const String& site, uint64_t flags, uint64_t maxAge);
+
 private:
     explicit NetscapePluginModule(const String& pluginPath);
 
     void determineQuirks();
 
+#if PLUGIN_ARCHITECTURE(X11)
+    void applyX11QuirksBeforeLoad();
+#endif
+
+    void incrementLoadCount();
+    void decrementLoadCount();
+
+    bool tryGetSitesWithData(Vector<String>&);
+    bool tryClearSiteData(const String& site, uint64_t flags, uint64_t maxAge);
+
     bool tryLoad();
     bool load();
     void unload();
@@ -66,7 +82,7 @@ private:
 
     String m_pluginPath;
     bool m_isInitialized;
-    unsigned m_pluginCount;
+    unsigned m_loadCount;
 
     PluginQuirks m_pluginQuirks;