Browser Plugin: New Implementation (Browser Side)

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index c8e64f16b1c2294a75409046f288ba16b05ae083..16967b46d46b308076b36748e08e46928ca101cc 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -15,6 +15,8 @@
 #include "base/sys_info.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
+#include "content/browser/browser_plugin/browser_plugin_embedder.h"
+#include "content/browser/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/browser_plugin/old/old_browser_plugin_host.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/debugger/devtools_manager_impl.h"
@@ -35,6 +37,7 @@
 #include "content/browser/web_contents/interstitial_page_impl.h"
 #include "content/browser/web_contents/navigation_entry_impl.h"
 #include "content/browser/webui/web_ui_impl.h"
+#include "content/common/browser_plugin_messages.h"
 #include "content/common/intents_messages.h"
 #include "content/common/ssl_status_serialization.h"
 #include "content/common/view_messages.h"
@@ -684,6 +687,8 @@ bool WebContentsImpl::OnMessageReceived(RenderViewHost* render_view_host,
     IPC_MESSAGE_HANDLER(ViewHostMsg_WebUISend, OnWebUISend)
     IPC_MESSAGE_HANDLER(ViewHostMsg_RequestPpapiBrokerPermission,
                         OnRequestPpapiBrokerPermission)
+    IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_NavigateGuest,
+                        OnBrowserPluginNavigateGuest)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
   message_source_ = NULL;
@@ -2271,6 +2276,27 @@ void WebContentsImpl::OnPpapiBrokerPermissionResult(int request_id,
                                                     result));
 }
 
+void WebContentsImpl::OnBrowserPluginNavigateGuest(int instance_id,
+                                                   int64 frame_id,
+                                                   std::string src,
+                                                   gfx::Size size) {
+  // This is the first 'navigate' to a browser plugin, before WebContents has/is
+  // an 'Embedder'; subsequent navigate messages for this WebContents will
+  // be handled by the BrowserPluginEmbedderHelper of the embedder itself (this
+  // also means any message from browser plugin renderer prior to NavigateGuest
+  // which is not NavigateGuest will be ignored). Therefore
+  // browser_plugin_embedder_ should not be set.

[awong, 2012/09/06 00:23:27]

browser_plugin_embedder_ -> |browser_plugin_embedder_|

[lazyboy, 2012/09/06 04:33:53]

Done.

+  DCHECK(!browser_plugin_embedder_.get());

[awong, 2012/09/06 00:23:27]

How "impossible" is it for a bug to creep in that lets browser_plugin_embedder_
become non-NULL here?

If it's not super close to impossible, then I think this should be a CHECK. 
Otherwise, the following code probably will cause a use-after-free for other
objects that are holding on to the old browser_plugin_embedder_.

[lazyboy, 2012/09/06 04:33:53]

Changed to CHECK.

+
+  browser_plugin_embedder_.reset(
+      content::BrowserPluginEmbedder::Create(this, GetRenderViewHost()));
+  browser_plugin_embedder_->NavigateGuest(GetRenderViewHost(),
+                                          instance_id,
+                                          frame_id,
+                                          src,
+                                          size);
+}
+
 // Notifies the RenderWidgetHost instance about the fact that the page is
 // loading, or done loading and calls the base implementation.
 void WebContentsImpl::SetIsLoading(bool is_loading,
@@ -2427,6 +2453,10 @@ void WebContentsImpl::NotifySwapped() {
       content::NOTIFICATION_WEB_CONTENTS_SWAPPED,
       content::Source<WebContents>(this),
       content::NotificationService::NoDetails());
+
+  // Once we swap RenderViewHosts, we remove browser plugin embedder if its
+  // associated RenderViewHost has been swapped out.

[awong, 2012/09/06 00:23:27]

This comment just describes the code directly. Instead, please describe why the
logic makes sense.

http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Implementation...

[lazyboy, 2012/09/06 04:33:53]

Done.

+  RemoveSwappedOutBrowserPluginEmbedder();
 }
 
 void WebContentsImpl::NotifyConnected() {
@@ -2472,6 +2502,13 @@ gfx::Rect WebContentsImpl::GetRootWindowResizerRect() const {
   return gfx::Rect();
 }
 
+void WebContentsImpl::RemoveSwappedOutBrowserPluginEmbedder() {
+  if (browser_plugin_embedder_.get() &&
+      !browser_plugin_embedder_->IsForRenderViewHost(GetRenderViewHost())) {
+    browser_plugin_embedder_.reset();
+  }
+}
+
 void WebContentsImpl::RenderViewCreated(RenderViewHost* render_view_host) {
   // Don't send notifications if we are just creating a swapped-out RVH for
   // the opener chain.  These won't be used for view-source or WebUI, so it's
@@ -3260,3 +3297,18 @@ void WebContentsImpl::GetBrowserPluginEmbedderInfo(
                      embedder_process_id);
   }
 }
+
+content::BrowserPluginGuest* WebContentsImpl::SetBrowserPluginGuest(
+    int instance_id) {
+  browser_plugin_guest_.reset(content::BrowserPluginGuest::Create(
+      instance_id, this, GetRenderViewHost()));
+  return browser_plugin_guest_.get();
+}
+
+content::BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() {
+  return browser_plugin_guest_.get();
+}
+
+content::BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() {
+  return browser_plugin_embedder_.get();
+}