| Index: ppapi/proxy/plugin_var_tracker.h
|
| diff --git a/ppapi/proxy/plugin_var_tracker.h b/ppapi/proxy/plugin_var_tracker.h
|
| index cafb3abfaa5d1edb56e422c82f5e3d4436551a0c..732350bbd042aac56309259eab5971b5a473a2e3 100644
|
| --- a/ppapi/proxy/plugin_var_tracker.h
|
| +++ b/ppapi/proxy/plugin_var_tracker.h
|
| @@ -24,7 +24,7 @@ class ProxyObjectVar;
|
|
|
| namespace proxy {
|
|
|
| -class PluginDispatcher;
|
| +class Dispatcher;
|
|
|
| // Tracks live strings and objects in the plugin process.
|
| class PPAPI_PROXY_EXPORT PluginVarTracker : public VarTracker {
|
| @@ -32,30 +32,17 @@ class PPAPI_PROXY_EXPORT PluginVarTracker : public VarTracker {
|
| PluginVarTracker();
|
| ~PluginVarTracker();
|
|
|
| - // Manages tracking for receiving a VARTYPE_OBJECT from the remote side
|
| - // (either the plugin or the renderer) that has already had its reference
|
| - // count incremented on behalf of the caller.
|
| - PP_Var ReceiveObjectPassRef(const PP_Var& var, PluginDispatcher* dispatcher);
|
| -
|
| - // See the comment in var_tracker.h for more about what a tracked object is.
|
| - // This adds and releases the "track_with_no_reference_count" for a given
|
| - // object.
|
| - PP_Var TrackObjectWithNoReference(const PP_Var& host_var,
|
| - PluginDispatcher* dispatcher);
|
| - void StopTrackingObjectWithNoReference(const PP_Var& plugin_var);
|
| -
|
| - // Returns the host var for the corresponding plugin object var. The object
|
| - // should be a VARTYPE_OBJECT. The reference count is not affeceted.
|
| - PP_Var GetHostObject(const PP_Var& plugin_object) const;
|
| -
|
| - PluginDispatcher* DispatcherForPluginObject(
|
| - const PP_Var& plugin_object) const;
|
| -
|
| - // Like Release() but the var is identified by its host object ID (as
|
| - // returned by GetHostObject).
|
| - void ReleaseHostObject(PluginDispatcher* dispatcher,
|
| - const PP_Var& host_object);
|
| -
|
| + virtual PP_Var ReceiveObjectPassRef(
|
| + const PP_Var& var, Dispatcher* dispatcher) OVERRIDE;
|
| + virtual PP_Var TrackObjectWithNoReference(const PP_Var& host_var,
|
| + Dispatcher* dispatcher) OVERRIDE;
|
| + virtual void StopTrackingObjectWithNoReference(
|
| + const PP_Var& plugin_var) OVERRIDE;
|
| + virtual PP_Var GetHostObject(const PP_Var& plugin_object) const OVERRIDE;
|
| + virtual Dispatcher* DispatcherForPluginObject(
|
| + const PP_Var& plugin_object) const OVERRIDE;
|
| + virtual void ReleaseHostObject(Dispatcher* dispatcher,
|
| + const PP_Var& host_object) OVERRIDE;
|
| private:
|
| // VarTracker protected overrides.
|
| virtual int32 AddVarInternal(Var* var, AddVarRefMode mode) OVERRIDE;
|
| @@ -70,13 +57,13 @@ class PPAPI_PROXY_EXPORT PluginVarTracker : public VarTracker {
|
|
|
| // Represents a var as received from the host.
|
| struct HostVar {
|
| - HostVar(PluginDispatcher* d, int32 i);
|
| + HostVar(Dispatcher* d, int32 i);
|
|
|
| bool operator<(const HostVar& other) const;
|
|
|
| // The dispatcher that sent us this object. This is used so we know how to
|
| // send back requests on this object.
|
| - PluginDispatcher* dispatcher;
|
| + Dispatcher* dispatcher;
|
|
|
| // The object ID that the host generated to identify the object. This is
|
| // unique only within that host: different hosts could give us different
|
| @@ -100,7 +87,7 @@ class PPAPI_PROXY_EXPORT PluginVarTracker : public VarTracker {
|
| // and returns it. If it's created, it's not added to the map.
|
| scoped_refptr<ProxyObjectVar> FindOrMakePluginVarFromHostVar(
|
| const PP_Var& var,
|
| - PluginDispatcher* dispatcher);
|
| + Dispatcher* dispatcher);
|
|
|
| // Maps host vars in the host to IDs in the plugin process.
|
| typedef std::map<HostVar, int32> HostVarToPluginVarMap;
|
|
|