Browser Plugin: Renderer-side changes

content/renderer/browser_plugin/browser_plugin.cc

Index: content/renderer/browser_plugin/browser_plugin.cc
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
new file mode 100644
index 0000000000000000000000000000000000000000..181acd3ae878e92ea4168507d6edaf76ba8f1fdd
--- /dev/null
+++ b/content/renderer/browser_plugin/browser_plugin.cc
@@ -0,0 +1,166 @@
+// 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.h"
+
+#include "base/atomic_sequence_num.h"
+#include "base/id_map.h"
+#include "base/lazy_instance.h"
+#include "base/process.h"
+#include "base/string_number_conversions.h"
+#include "base/string_piece.h"
+#include "base/string_util.h"
+#include "base/values.h"
+#include "content/common/browser_plugin_messages.h"
+#include "content/public/renderer/render_view.h"

[jam, 2012/05/16 02:22:40]

nit: in general, in content we include the impl by convention. in this case, you
already include the impl, so take this out

[Fady Samuel, 2012/05/16 04:43:54]

Done.

+#include "content/renderer/render_view_impl.h"
+#include "ipc/ipc_channel_handle.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h"
+#include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
+#include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
+#include "webkit/plugins/webview_plugin.h"
+
+static base::StaticAtomicSequenceNumber g_next_id;

[jam, 2012/05/16 02:22:40]

this should just be an int (you only need SASN if this is multi threaded)

[Fady Samuel, 2012/05/16 04:43:54]

Hmm, this is probably a remnant from a previous iteration where things were
happening on multiple threads...I'm not sure...removing.

+
+// The global list of all Browser Plugin Placeholders within a process.
+base::LazyInstance<IDMap<BrowserPlugin> >::Leaky
+    g_all_browser_plugins = LAZY_INSTANCE_INITIALIZER;
+
+using webkit::WebViewPlugin;

[jam, 2012/05/16 02:22:40]

nit: order

[Fady Samuel, 2012/05/16 04:43:54]

Done.

+using WebKit::WebPlugin;
+using WebKit::WebPluginContainer;
+
+const char* const kPluginPlaceholderDataURL =

[jam, 2012/05/16 02:22:40]

nit: this fits on one line. also, you should use the url constant from
url_constants.h instead of redefining it here (kAboutBlankURL)

[Fady Samuel, 2012/05/16 04:43:54]

Removed. Using kAboutBlankURL

+    "about:blank";
+
+// static
+WebKit::WebPlugin* BrowserPlugin::Create(
+    RenderViewImpl* render_view,
+    WebKit::WebFrame* frame,
+    const WebKit::WebPluginParams& params) {
+  // TODO(fsamuel): Figure out what the lifetime is of this class.
+  // It seems we need to blow away this object once a WebPluginContainer is
+  // gone. How do we detect it's gone? A WebKit change perhaps?
+  BrowserPlugin* browser_plugin = new BrowserPlugin(
+      render_view, frame, params, "");
+  return browser_plugin->plugin_placeholder();
+}
+
+// static
+BrowserPlugin* BrowserPlugin::FromID(int id) {
+  return g_all_browser_plugins.Get().Lookup(id);
+}
+
+BrowserPlugin::BrowserPlugin(
+    RenderViewImpl* render_view,
+    WebKit::WebFrame* frame,
+    const WebKit::WebPluginParams& params,
+    const std::string& html_data)
+    : render_view_(render_view),
+      plugin_params_(params),
+      placeholder_(webkit::WebViewPlugin::Create(
+                   NULL, render_view->GetWebkitPreferences(), html_data,

[jam, 2012/05/16 02:22:40]

nit: this tabbing is off

[Fady Samuel, 2012/05/16 04:43:54]

Done.

+                   GURL(kPluginPlaceholderDataURL))),
+      plugin_(NULL) {
+  id_ = g_next_id.GetNext();
+  Register(GetID(), this);
+
+  // By default we navigate to google.com
+  GetPluginParameters(0, 0, "");
+
+  if (!src_.empty())

[jam, 2012/05/16 02:22:40]

nit: need brace brackets per style guide

[Fady Samuel, 2012/05/16 04:43:54]

Done.

+    render_view->Send(new BrowserPluginHostMsg_NavigateFromEmbedder(
+        render_view->GetRoutingID(),
+        GetID(),
+        frame->identifier(),
+        src_,
+        size_));
+}
+
+BrowserPlugin::~BrowserPlugin() {
+  Unregister(GetID());
+}
+
+// static
+void BrowserPlugin::Register(int id, BrowserPlugin* browser_plugin) {
+  g_all_browser_plugins.Get().AddWithID(browser_plugin, id);
+}
+
+// static
+void BrowserPlugin::Unregister(int id) {
+  if (g_all_browser_plugins.Get().Lookup(id))
+    g_all_browser_plugins.Get().Remove(id);
+}
+
+const WebKit::WebPluginParams& BrowserPlugin::plugin_params() const {
+    return plugin_params_;
+}
+
+void BrowserPlugin::GetPluginParameters(
+    int default_width, int default_height,
+    const std::string& default_src) {

[jam, 2012/05/16 02:22:40]

nit: are you sure this doesn't fit on one line?

[Fady Samuel, 2012/05/16 04:43:54]

Done.

+  int width = default_width;
+  int height = default_height;
+
+  // Get the plugin parameters from the attributes vector
+  for (unsigned i = 0; i < plugin_params_.attributeNames.size(); ++i) {
+    std::string attributeName = plugin_params_.attributeNames[i].utf8();
+    if (LowerCaseEqualsASCII(attributeName, "width")) {
+      std::string attributeValue = plugin_params_.attributeValues[i].utf8();
+      CHECK(base::StringToInt(attributeValue, &width));
+    } else if (LowerCaseEqualsASCII(attributeName, "height")) {
+      std::string attributeValue = plugin_params_.attributeValues[i].utf8();
+      CHECK(base::StringToInt(attributeValue, &height));
+    } else if (LowerCaseEqualsASCII(attributeName, "src")) {
+      src_ = plugin_params_.attributeValues[i].utf8();
+    }
+  }
+  // If we didn't find the attributes set or they're not sensible,
+  // we reset our attributes to the default.
+  if (src_.empty())
+    src_ = default_src;
+
+  size_.SetSize(width, height);
+}
+
+void BrowserPlugin::LoadGuest(
+    int guest_process_id,
+    const IPC::ChannelHandle& channel_handle) {
+  webkit::ppapi::WebPluginImpl* new_guest =
+      render_view()->CreateBrowserPlugin(channel_handle,
+                                         guest_process_id,
+                                         plugin_params());
+  Replace(new_guest);
+}
+
+void BrowserPlugin::Replace(
+    webkit::ppapi::WebPluginImpl* new_plugin) {
+  WebKit::WebPlugin* current_plugin =
+      plugin_ ? static_cast<WebKit::WebPlugin*>(plugin_) : placeholder_;

[jam, 2012/05/16 02:22:40]

no cast needed

[Fady Samuel, 2012/05/16 04:43:54]

gcc isn't happy: error: conditional expression between distinct pointer types
'webkit::ppapi::WebPluginImpl*' and 'webkit::WebViewPlugin*' lacks a cast

+  WebKit::WebPluginContainer* container = current_plugin->container();
+  if (!new_plugin || !new_plugin->initialize(container))
+    return;
+
+  // Clear the container's backing texture ID and the script objects.
+  if (plugin_)
+    plugin_->instance()->BindGraphics(plugin_->instance()->pp_instance(), 0);
+
+  // Inform the browser process of the association between the browser plugin's
+  // instance ID and the pepper channel's PP_Instance identifier.
+  render_view()->Send(new BrowserPluginHostMsg_MapInstance(
+      render_view()->GetRoutingID(),
+      GetID(),
+      new_plugin->instance()->pp_instance()));
+  // TODO(fsamuel): We should delay the swapping out of the current plugin
+  // until after the guest's WebGraphicsContext3D has been initialized. That
+  // way, we immediately have something to render onto the screen.
+  container->setPlugin(new_plugin);
+  container->invalidate();
+  container->reportGeometry();
+  if (plugin_)
+    plugin_->destroy();
+  plugin_ = new_plugin;
+}