Chromium Code Reviews| Index: ppapi/native_client/src/trusted/plugin/scriptable_handle.h |
| =================================================================== |
| --- ppapi/native_client/src/trusted/plugin/scriptable_handle.h (revision 121986) |
| +++ ppapi/native_client/src/trusted/plugin/scriptable_handle.h (working copy) |
| @@ -28,31 +28,22 @@ |
| namespace plugin { |
| // Forward declarations for externals. |
| -class DescBasedHandle; |
| class Plugin; |
| // ScriptableHandle encapsulates objects that are scriptable from the browser. |
|
jvoung - send to chromium...
2012/02/15 08:28:17
It seems like from the implementation, most of the
sehr (please use chromium)
2012/02/15 17:58:10
You're right. It only wraps Plugins now and they
|
| class ScriptableHandle : public pp::deprecated::ScriptableObject { |
| public: |
| - // Factory methods for creation. |
| + // Factory method. |
| static ScriptableHandle* NewPlugin(Plugin* plugin); |
| - static ScriptableHandle* NewDescHandle(DescBasedHandle* desc_handle); |
| // If not NULL, this var should be reused to pass this object to the browser. |
| pp::VarPrivate* var() { return var_; } |
| - // Check that a pointer is to a validly created ScriptableHandle. |
| - static bool is_valid(const ScriptableHandle* handle); |
| static void Unref(ScriptableHandle** handle); |
| // Get the contained plugin object. NULL if this contains a descriptor. |
| Plugin* plugin() const { return plugin_; } |
| - // Get the contained descriptor object. NULL if this contains a plugin. |
| - // OBSOLETE -- this support is only needed for SRPC descriptor passing. |
| - // TODO(polina): Remove this support when SRPC descriptor passing is removed. |
| - DescBasedHandle* desc_handle() const { return desc_handle_; } |
| - |
| // This function is called when we are about to share the object owned by the |
| // plugin with the browser. Since reference counting on the browser side is |
| // handled via pp::Var's, we create the var() here if not created already. |
| @@ -100,7 +91,6 @@ |
| // Prevent construction from outside the class: must use factory New() |
| // method instead. |
| explicit ScriptableHandle(Plugin* plugin); |
| - explicit ScriptableHandle(DescBasedHandle* desc_handle); |
| // This will be called when both the plugin and the browser clear all |
| // references to this object. |
| virtual ~ScriptableHandle(); |
| @@ -123,10 +113,6 @@ |
| // The contained plugin object. |
| Plugin* plugin_; |
| - // OBSOLETE -- this support is only needed for SRPC descriptor passing. |
| - // TODO(polina): Remove this support when SRPC descriptor passing is removed. |
| - // The contained descriptor handle object. |
| - DescBasedHandle* desc_handle_; |
| }; |
| } // namespace plugin |