summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-15 19:30:50 +0000
committerdumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-15 19:30:50 +0000
commitd7a3eb035972863c1b011fe5aa47cc4353733910 (patch)
tree3f11c3774f9756f2bbe148e0c6b174e8d4d51ca1 /webkit
parent6d9a2eb17e0d64a35d936a958d1919ca7ea549f4 (diff)
downloadchromium_src-d7a3eb035972863c1b011fe5aa47cc4353733910.zip
chromium_src-d7a3eb035972863c1b011fe5aa47cc4353733910.tar.gz
chromium_src-d7a3eb035972863c1b011fe5aa47cc4353733910.tar.bz2
Make PepperModule inherit from base::SupportsWeakPtr. This is needed
to determine when callbacks initiated by static functions should not run. BUG=none TEST=none Review URL: http://codereview.chromium.org/3431005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59536 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/plugins/pepper_plugin_module.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/webkit/glue/plugins/pepper_plugin_module.h b/webkit/glue/plugins/pepper_plugin_module.h
index e543562..a560c56 100644
--- a/webkit/glue/plugins/pepper_plugin_module.h
+++ b/webkit/glue/plugins/pepper_plugin_module.h
@@ -11,6 +11,7 @@
#include "base/basictypes.h"
#include "base/native_library.h"
#include "base/ref_counted.h"
+#include "base/weak_ptr.h"
#include "third_party/ppapi/c/pp_module.h"
#include "third_party/ppapi/c/ppb.h"
@@ -26,7 +27,8 @@ class PluginDelegate;
class PluginInstance;
class PluginObject;
-class PluginModule : public base::RefCounted<PluginModule> {
+class PluginModule : public base::RefCounted<PluginModule>,
+ public base::SupportsWeakPtr<PluginModule> {
public:
typedef const void* (*PPP_GetInterfaceFunc)(const char*);
typedef int (*PPP_InitializeModuleFunc)(PP_Module, PPB_GetInterface);