Browser Plugin: Renderer-side changes

content/renderer/browser_plugin/browser_plugin_placeholder.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_placeholder.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/view_messages.h"
+#include "content/common/browser_plugin_messages.h"
 #include "content/public/renderer/render_view.h"
+#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/webview_plugin.h"
 
 static base::StaticAtomicSequenceNumber g_next_id;
 
 // The global list of all Browser Plugin Placeholders within a process.
 base::LazyInstance<IDMap<BrowserPluginPlaceholder> >::Leaky
@@ skipping 33 matching lines @@
       plugin_params_(params),
       plugin_(webkit::WebViewPlugin::Create(
               this, render_view->GetWebkitPreferences(), html_data,
                         GURL(kPluginPlaceholderDataURL))) {
   id_ = g_next_id.GetNext();
   RegisterPlaceholder(GetID(), this);
 
   // By default we navigate to google.com
   GetPluginParameters(0, 0, "http://www.google.com/");
 
-  // TODO(fsamuel): Request a browser plugin instance from the
-  // browser process.
+  render_view->Send(new BrowserPluginHostMsg_OpenChannel(
+      render_view->GetRoutingID(), GetID(), frame->identifier(), src_, size_));
 }
 
 BrowserPluginPlaceholder::~BrowserPluginPlaceholder() {
   UnregisterPlaceholder(GetID());
 }
 
 void BrowserPluginPlaceholder::RegisterPlaceholder(
     int id,
     BrowserPluginPlaceholder* placeholder) {
   g_all_placeholders.Get().AddWithID(placeholder, id);
@@ skipping 31 matching lines @@
   // we reset our attributes to the default.
   if (src_.empty())
     src_ = default_src;
 
   size_.SetSize(width, height);
 }
 
 void BrowserPluginPlaceholder::GuestReady(
     base::ProcessHandle process_handle,
     const IPC::ChannelHandle& channel_handle) {
-  // TODO(fsamuel): Once the guest renderer is ready,
-  // it will inform the host renderer and the BrowserPluginPlaceholder
-  // can swap itself out with the guest.
-  NOTIMPLEMENTED();
+  WebKit::WebPlugin* new_plugin =
+      static_cast<RenderViewImpl*>(

[piman, 2012/04/06 23:19:26]

This cast makes me nervous.
Either expose CreateBrowserPlugin on RenderView, or make
BrowserPluginPlaceholder take a RenderViewImpl rather than a RenderView.

[Fady Samuel, 2012/04/11 22:06:34]

Done. BrowserPluginPlaceholder now takes in a RenderView.

+          render_view())->CreateBrowserPlugin(process_handle,
+                                              channel_handle,
+                                              plugin_params());
+  LoadGuest(new_plugin);
 }
 
 void BrowserPluginPlaceholder::LoadGuest(WebKit::WebPlugin* new_plugin) {
   WebKit::WebPluginContainer* container = plugin_->container();
   if (!new_plugin || !new_plugin->initialize(container))
     return;
   plugin_->RestoreTitleText();
   container->setPlugin(new_plugin);
   container->invalidate();
   container->reportGeometry();
   plugin_->ReplayReceivedData(new_plugin);
   plugin_->destroy();
 }
 
 void BrowserPluginPlaceholder::WillDestroyPlugin() {
   delete this;
 }