Bind plugin placeholder directly to v8 instead of over CppBoundClass

components/plugins/renderer/plugin_placeholder.cc

 // Copyright 2013 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 "components/plugins/renderer/plugin_placeholder.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/string_escape.h"
 #include "base/strings/string_piece.h"
@@ skipping 16 matching lines @@
 using content::RenderThread;
 using blink::WebElement;
 using blink::WebFrame;
 using blink::WebMouseEvent;
 using blink::WebNode;
 using blink::WebPlugin;
 using blink::WebPluginContainer;
 using blink::WebPluginParams;
 using blink::WebScriptSource;
 using blink::WebURLRequest;
-using webkit_glue::CppArgumentList;
-using webkit_glue::CppVariant;
 
 namespace plugins {
 
 PluginPlaceholder::PluginPlaceholder(content::RenderView* render_view,
                                      WebFrame* frame,
                                      const WebPluginParams& params,
                                      const std::string& html_data,
                                      GURL placeholderDataUrl)
     : content::RenderViewObserver(render_view),
       frame_(frame),
       plugin_params_(params),
       plugin_(WebViewPlugin::Create(this,
                                     render_view->GetWebkitPreferences(),
                                     html_data,
                                     placeholderDataUrl)),
       is_blocked_for_prerendering_(false),
       allow_loading_(false),
       hidden_(false),
       finished_loading_(false) {}
 
 PluginPlaceholder::~PluginPlaceholder() {}
 
+void PluginPlaceholder::InstallAdditionalCallbacks(
+    v8::Handle<v8::Template> prototype) {}
+
 void PluginPlaceholder::BindWebFrame(WebFrame* frame) {
-  BindToJavascript(frame, "plugin");
-  BindCallback(
-      "load",
-      base::Bind(&PluginPlaceholder::LoadCallback, base::Unretained(this)));
-  BindCallback(
-      "hide",
-      base::Bind(&PluginPlaceholder::HideCallback, base::Unretained(this)));
-  BindCallback("didFinishLoading",
-               base::Bind(&PluginPlaceholder::DidFinishLoadingCallback,
-                          base::Unretained(this)));
+  v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
+  v8::Handle<v8::Context> context = frame->mainWorldScriptContext();
+
+  if (context.IsEmpty())
+    return;
+
+  v8::Context::Scope context_scope(context);
+
+  v8::Handle<v8::FunctionTemplate> plugin_template =
+      v8::FunctionTemplate::New();
+  v8::Handle<v8::Template> prototype = plugin_template->PrototypeTemplate();
+  prototype->Set(
+      v8::String::New("load"),
+      v8::FunctionTemplate::New(&PluginPlaceholder::LoadCallback,
+                                v8::External::New(this))->GetFunction());
+  prototype->Set(
+      v8::String::New("hide"),
+      v8::FunctionTemplate::New(&PluginPlaceholder::HideCallback,
+                                v8::External::New(this))->GetFunction());
+  prototype->Set(
+      v8::String::New("didFinishLoading"),
+      v8::FunctionTemplate::New(&PluginPlaceholder::DidFinishLoadingCallback,
+                                v8::External::New(this))->GetFunction());
+
+  InstallAdditionalCallbacks(prototype);
+
+  v8::Handle<v8::Object> global = context->Global();
+  global->Set(v8::String::New("plugin"),
+              plugin_template->GetFunction()->NewInstance());
 }
 
 void PluginPlaceholder::ReplacePlugin(WebPlugin* new_plugin) {
   CHECK(plugin_);
   if (!new_plugin) return;
   WebPluginContainer* container = plugin_->container();
   // Set the new plug-in on the container before initializing it.
   container->setPlugin(new_plugin);
   // Save the element in case the plug-in is removed from the page during
   // initialization.
@@ skipping 117 matching lines @@
   }
 
   // TODO(mmenke):  In the case of prerendering, feed into
   //                ChromeContentRendererClient::CreatePlugin instead, to
   //                reduce the chance of future regressions.
   WebPlugin* plugin =
       render_view()->CreatePlugin(frame_, plugin_info_, plugin_params_);
   ReplacePlugin(plugin);
 }
 
-void PluginPlaceholder::LoadCallback(const CppArgumentList& args,
-                                     CppVariant* result) {
+// static
+void PluginPlaceholder::LoadCallback(
+    const v8::FunctionCallbackInfo<v8::Value>& args) {
+  PluginPlaceholder* plugin = reinterpret_cast<PluginPlaceholder*>(

[Bernhard Bauer, 2013/11/12 16:37:20]

This reinterpret_cast business looks kinda messy. Do you think you could extract
this into a shared base class (templatized) that can register itself for
callbacks?

Also, if we can register arbitrary base::Closures, we could bind them with weak
pointers to make sure that the object is still alive when we call the method on
it. I don't think we have that guarantee now, do we?

+      v8::External::Cast(*args.Data())->Value());
   RenderThread::Get()->RecordUserMetrics("Plugin_Load_Click");
-  LoadPlugin();
+  plugin->LoadPlugin();
 }
 
-void PluginPlaceholder::HideCallback(const CppArgumentList& args,
-                                     CppVariant* result) {
+// static
+void PluginPlaceholder::HideCallback(
+    const v8::FunctionCallbackInfo<v8::Value>& args) {
+  PluginPlaceholder* plugin = reinterpret_cast<PluginPlaceholder*>(
+      v8::External::Cast(*args.Data())->Value());
   RenderThread::Get()->RecordUserMetrics("Plugin_Hide_Click");
-  HidePlugin();
+  plugin->HidePlugin();
 }
 
-void PluginPlaceholder::DidFinishLoadingCallback(const CppArgumentList& args,
-                                                 CppVariant* result) {
-  finished_loading_ = true;
-  if (message_.length() > 0)
-    UpdateMessage();
+// static
+void PluginPlaceholder::DidFinishLoadingCallback(
+    const v8::FunctionCallbackInfo<v8::Value>& args) {
+  PluginPlaceholder* plugin = reinterpret_cast<PluginPlaceholder*>(
+      v8::External::Cast(*args.Data())->Value());
+  plugin->finished_loading_ = true;
+  if (plugin->message_.length() > 0)
+    plugin->UpdateMessage();
 }
 
 void PluginPlaceholder::SetPluginInfo(
     const content::WebPluginInfo& plugin_info) {
   plugin_info_ = plugin_info;
 }
 
 const content::WebPluginInfo& PluginPlaceholder::GetPluginInfo() const {
   return plugin_info_;
 }
 
 void PluginPlaceholder::SetIdentifier(const std::string& identifier) {
   identifier_ = identifier;
 }
 
 blink::WebFrame* PluginPlaceholder::GetFrame() { return frame_; }
 
 const blink::WebPluginParams& PluginPlaceholder::GetPluginParams() const {
   return plugin_params_;
 }
 
 }  // namespace plugins