diff options
author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h | |
parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h')
-rw-r--r-- | Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h b/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h index aee26bb..4ec7991 100644 --- a/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h +++ b/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h @@ -45,9 +45,9 @@ public: ~NetscapePluginModule(); const NPPluginFuncs& pluginFuncs() const { return m_pluginFuncs; } - - void pluginCreated(); - void pluginDestroyed(); + + void incrementLoadCount(); + void decrementLoadCount(); static bool getPluginInfo(const String& pluginPath, PluginInfoStore::Plugin&); @@ -68,9 +68,6 @@ private: void applyX11QuirksBeforeLoad(); #endif - void incrementLoadCount(); - void decrementLoadCount(); - bool tryGetSitesWithData(Vector<String>&); bool tryClearSiteData(const String& site, uint64_t flags, uint64_t maxAge); |