Browser Plugin: Simplified guest attachment

content/renderer/browser_plugin/browser_plugin_bindings.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/browser_plugin/browser_plugin_bindings.h"
 
 #include <cstdlib>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 213 matching lines @@
  private:
   std::string name_;
   uint32 arg_count_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginMethodBinding);
 };
 
 class BrowserPluginBindingAttach: public BrowserPluginMethodBinding {
  public:
   BrowserPluginBindingAttach()
-      : BrowserPluginMethodBinding(
-          browser_plugin::kMethodInternalAttach, 1) {
-  }
+      : BrowserPluginMethodBinding(browser_plugin::kMethodInternalAttach, 2) {}
 
   virtual bool Invoke(BrowserPluginBindings* bindings,
                       const NPVariant* args,
                       NPVariant* result) OVERRIDE {
     if (!bindings->instance()->render_view())
       return false;
 
+    int instance_id = IntFromNPVariant(args[0]);
+    if (!instance_id)
+      return false;
+
     scoped_ptr<V8ValueConverter> converter(V8ValueConverter::create());
-    v8::Handle<v8::Value> obj(blink::WebBindings::toV8Value(&args[0]));
+    v8::Handle<v8::Value> obj(blink::WebBindings::toV8Value(&args[1]));
     scoped_ptr<base::Value> value(
         converter->FromV8Value(obj, bindings->instance()->render_view()->
             GetWebView()->mainFrame()->mainWorldScriptContext()));
     if (!value)
       return false;
 
     if (!value->IsType(base::Value::TYPE_DICTIONARY))
       return false;
 
     scoped_ptr<base::DictionaryValue> extra_params(
         static_cast<base::DictionaryValue*>(value.release()));
-    bindings->instance()->Attach(extra_params.Pass());
+    bindings->instance()->Attach(instance_id, extra_params.Pass());
     return true;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginBindingAttach);
 };
 
-class BrowserPluginBindingAttachWindowTo : public BrowserPluginMethodBinding {
- public:
-  BrowserPluginBindingAttachWindowTo()
-      : BrowserPluginMethodBinding(
-          browser_plugin::kMethodInternalAttachWindowTo, 2) {
-  }
-
-  virtual bool Invoke(BrowserPluginBindings* bindings,
-                      const NPVariant* args,
-                      NPVariant* result) OVERRIDE {
-    blink::WebNode node;
-    WebBindings::getNode(NPVARIANT_TO_OBJECT(args[0]), &node);
-    int window_id = IntFromNPVariant(args[1]);
-    BOOLEAN_TO_NPVARIANT(BrowserPlugin::AttachWindowTo(node, window_id),
-                         *result);
-    return true;
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(BrowserPluginBindingAttachWindowTo);
-};
-
 // BrowserPluginPropertyBinding ------------------------------------------------
 
 class BrowserPluginPropertyBinding {
  public:
   explicit BrowserPluginPropertyBinding(const char name[]) : name_(name) {}
   virtual ~BrowserPluginPropertyBinding() {}
   const std::string& name() const { return name_; }
   bool MatchesName(NPIdentifier name) const {
     return WebBindings::getStringIdentifier(name_.c_str()) == name;
   }
@@ skipping 367 matching lines @@
     : instance_(instance),
       np_object_(NULL),
       weak_ptr_factory_(this) {
   NPObject* obj =
       WebBindings::createObject(instance->pluginNPP(),
                                 &browser_plugin_message_class);
   np_object_ = static_cast<BrowserPluginBindings::BrowserPluginNPObject*>(obj);
   np_object_->message_channel = weak_ptr_factory_.GetWeakPtr();
 
   method_bindings_.push_back(new BrowserPluginBindingAttach);
-  method_bindings_.push_back(new BrowserPluginBindingAttachWindowTo);
 
   property_bindings_.push_back(
       new BrowserPluginPropertyBindingAllowTransparency);
   property_bindings_.push_back(new BrowserPluginPropertyBindingAutoSize);
   property_bindings_.push_back(new BrowserPluginPropertyBindingContentWindow);
   property_bindings_.push_back(new BrowserPluginPropertyBindingMaxHeight);
   property_bindings_.push_back(new BrowserPluginPropertyBindingMaxWidth);
   property_bindings_.push_back(new BrowserPluginPropertyBindingMinHeight);
   property_bindings_.push_back(new BrowserPluginPropertyBindingMinWidth);
   property_bindings_.push_back(new BrowserPluginPropertyBindingName);
@@ skipping 71 matching lines @@
   for (PropertyBindingList::iterator iter = property_bindings_.begin();
        iter != property_bindings_.end();
        ++iter) {
     if ((*iter)->MatchesName(name))
       return (*iter)->GetProperty(this, result);
   }
   return false;
 }
 
 }  // namespace content