Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(235)

Unified Diff: ppapi/proxy/plugin_var_serialization_rules.h

Issue 9655019: Fix a crash related to PPAPI scripting. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/proxy/plugin_dispatcher.cc ('k') | ppapi/proxy/plugin_var_serialization_rules.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/plugin_var_serialization_rules.h
diff --git a/ppapi/proxy/plugin_var_serialization_rules.h b/ppapi/proxy/plugin_var_serialization_rules.h
index 174c4bb473971902a6b67ce13c7dc0838fb3ebf4..1616a755220c9964b1f270db1550e32bd2034e8f 100644
--- a/ppapi/proxy/plugin_var_serialization_rules.h
+++ b/ppapi/proxy/plugin_var_serialization_rules.h
@@ -6,34 +6,45 @@
#define PPAPI_PROXY_PLUGIN_VAR_SERIALIZATION_RULES_H_
#include "base/basictypes.h"
+#include "base/memory/weak_ptr.h"
#include "ppapi/proxy/var_serialization_rules.h"
namespace ppapi {
namespace proxy {
+class PluginDispatcher;
class PluginVarTracker;
-// Implementation of the VarSerialization interface for the plugin.
+// Implementation of the VarSerializationRules interface for the plugin.
class PluginVarSerializationRules : public VarSerializationRules {
public:
// This class will use the given non-owning pointer to the var tracker to
// handle object refcounting and string conversion.
- PluginVarSerializationRules();
+ explicit PluginVarSerializationRules(
+ const base::WeakPtr<PluginDispatcher>& dispatcher);
~PluginVarSerializationRules();
// VarSerialization implementation.
virtual PP_Var SendCallerOwned(const PP_Var& var);
- virtual PP_Var BeginReceiveCallerOwned(const PP_Var& var,
- Dispatcher* dispatcher);
+ virtual PP_Var BeginReceiveCallerOwned(const PP_Var& var);
virtual void EndReceiveCallerOwned(const PP_Var& var);
- virtual PP_Var ReceivePassRef(const PP_Var& var, Dispatcher* dispatcher);
+ virtual PP_Var ReceivePassRef(const PP_Var& var);
virtual PP_Var BeginSendPassRef(const PP_Var& var);
- virtual void EndSendPassRef(const PP_Var& var, Dispatcher* dispatcher);
+ virtual void EndSendPassRef(const PP_Var& var);
virtual void ReleaseObjectRef(const PP_Var& var);
private:
PluginVarTracker* var_tracker_;
+ // In most cases, |dispatcher_| won't be NULL, but you should always check
+ // before using it.
+ // One scenario that it becomes NULL: A SerializedVar holds a ref to this
+ // object, and a sync message is issued. While waiting for the reply to the
+ // sync message, some incoming message causes the dispatcher to be destroyed.
+ // If that happens, we may leak references to object vars. Considering that
+ // scripting has been deprecated, this may not be a big issue.
+ base::WeakPtr<PluginDispatcher> dispatcher_;
+
DISALLOW_COPY_AND_ASSIGN(PluginVarSerializationRules);
};
« no previous file with comments | « ppapi/proxy/plugin_dispatcher.cc ('k') | ppapi/proxy/plugin_var_serialization_rules.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698