Revert of Replace NPObject usage in ppapi with gin

content/renderer/pepper/plugin_object.h

Index: content/renderer/pepper/plugin_object.h
diff --git a/content/renderer/pepper/plugin_object.h b/content/renderer/pepper/plugin_object.h
index 4f640b88cea70c6ab4ebd14b0a9a92aa4c4eef94..62ffd2ebfbdc6806af5978a1c89a6891e19b699f 100644
--- a/content/renderer/pepper/plugin_object.h
+++ b/content/renderer/pepper/plugin_object.h
@@ -8,16 +8,11 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/memory/weak_ptr.h"
-#include "gin/interceptor.h"
-#include "gin/wrappable.h"
-#include "ppapi/c/pp_var.h"
 
+struct PP_Var;
 struct PPP_Class_Deprecated;
-
-namespace gin {
-  class Arguments;
-}  // namespace gin
+typedef struct NPObject NPObject;
+typedef struct _NPVariant NPVariant;
 
 namespace content {
 
@@ -27,17 +22,9 @@
 //
 // In contrast, a var of type PP_VARTYPE_OBJECT is a reference to a JS object,
 // which might be implemented by the plugin (here) or by the JS engine.
-class PluginObject : public gin::Wrappable<PluginObject>,
-                     public gin::NamedPropertyInterceptor {
+class PluginObject {
  public:
-  static gin::WrapperInfo kWrapperInfo;
-
   virtual ~PluginObject();
-
-  // Returns the PluginObject which is contained in the given v8 object, or NULL
-  // if the object isn't backed by a PluginObject.
-  static PluginObject* FromV8Object(v8::Isolate* isolate,
-                                    v8::Handle<v8::Object> v8_object);
 
   // Allocates a new PluginObject and returns it as a PP_Var with a
   // refcount of 1.
@@ -45,40 +32,60 @@
                        const PPP_Class_Deprecated* ppp_class,
                        void* ppp_class_data);
 
-  // gin::NamedPropertyInterceptor
-  virtual v8::Local<v8::Value> GetNamedProperty(
-      v8::Isolate* isolate,
-      const std::string& property) OVERRIDE;
-  virtual std::vector<std::string> EnumerateNamedProperties(
-      v8::Isolate* isolate) OVERRIDE;
+  PepperPluginInstanceImpl* instance() const { return instance_; }
 
   const PPP_Class_Deprecated* ppp_class() { return ppp_class_; }
-  void* ppp_class_data() { return ppp_class_data_; }
+  void* ppp_class_data() {
+    return ppp_class_data_;
+  };
 
-  // Called when the instance is destroyed.
-  void InstanceDeleted();
+  NPObject* GetNPObject() const;
+
+  // Returns true if the given var is an object implemented by the same plugin
+  // that owns the var object, and that the class matches. If it matches,
+  // returns true and places the class data into |*ppp_class_data| (which can
+  // optionally be NULL if no class data is desired).
+  static bool IsInstanceOf(NPObject* np_object,
+                           const PPP_Class_Deprecated* ppp_class,
+                           void** ppp_class_data);
+
+  // Converts the given NPObject to the corresponding ObjectVar.
+  //
+  // The given NPObject must be one corresponding to a PluginObject or this
+  // will crash. If the object is a PluginObject but the plugin has gone
+  // away (the object could still be alive because of a reference from JS),
+  // then the return value will be NULL.
+  static PluginObject* FromNPObject(NPObject* object);
+
+  // Allocates a plugin wrapper object and returns it as an NPObject. This is
+  // used internally only.
+  static NPObject* AllocateObjectWrapper();
 
  private:
+  struct NPObjectWrapper;
+
+  // This object must be created using the CreateObject function of the which
+  // will set up the correct NPObject.
+  //
+  // The NPObjectWrapper (an NPObject) should already have the reference
+  // incremented on it, and this class will take ownership of that reference.
   PluginObject(PepperPluginInstanceImpl* instance,
+               NPObjectWrapper* object_wrapper,
                const PPP_Class_Deprecated* ppp_class,
                void* ppp_class_data);
 
-  // gin::Wrappable
-  virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
-      v8::Isolate* isolate) OVERRIDE;
+  PepperPluginInstanceImpl* instance_;
 
-  // Helper method to get named properties.
-  v8::Local<v8::Value> GetPropertyOrMethod(v8::Isolate* isolate,
-                                           PP_Var identifier_var);
-
-  void Call(const std::string& identifier, gin::Arguments* args);
-
-  PepperPluginInstanceImpl* instance_;
+  // Holds a pointer to the NPObject wrapper backing the var. This class
+  // derives from NPObject and we hold a reference to it, so it must be
+  // refcounted. When the type is not an object, this value will be NULL.
+  //
+  // We don't actually own this pointer, it's the NPObject that actually
+  // owns us.
+  NPObjectWrapper* object_wrapper_;
 
   const PPP_Class_Deprecated* ppp_class_;
   void* ppp_class_data_;
-
-  base::WeakPtrFactory<PluginObject> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginObject);
 };