Browser Plugin: Allocate Instance IDs in BrowserPluginEmbedder instead of BrowserPluginManager

content/browser/browser_plugin/browser_plugin_embedder.cc

Index: content/browser/browser_plugin/browser_plugin_embedder.cc
diff --git a/content/browser/browser_plugin/browser_plugin_embedder.cc b/content/browser/browser_plugin/browser_plugin_embedder.cc
index 031d4bf216807395f95297a9a3af1c8222f85523..12bacbbe6cd02309555f2d69e69168547d632b38 100644
--- a/content/browser/browser_plugin/browser_plugin_embedder.cc
+++ b/content/browser/browser_plugin/browser_plugin_embedder.cc
@@ -31,7 +31,8 @@ BrowserPluginEmbedder::BrowserPluginEmbedder(
     : WebContentsObserver(web_contents),
       render_view_host_(render_view_host),
       visible_(true),
-      next_get_render_view_request_id_(0) {
+      next_get_render_view_request_id_(0),
+      instance_id_counter_(0) {
   // Listen to visibility changes so that an embedder hides its guests
   // as well.
   registrar_.Add(this,
@@ -211,6 +212,8 @@ bool BrowserPluginEmbedder::OnMessageReceived(const IPC::Message& message) {
   }
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(BrowserPluginEmbedder, message)
+    IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_AllocateInstanceIDRequest,
+                        OnAllocateInstanceID)
     IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_CreateGuest,
                         OnCreateGuest)
     IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_PluginAtPositionResponse,
@@ -294,10 +297,22 @@ bool BrowserPluginEmbedder::ShouldForwardToBrowserPluginGuest(
   return false;
 }
 
+void BrowserPluginEmbedder::OnAllocateInstanceID(int request_id) {
+  int instance_id = ++instance_id_counter_;
+  render_view_host_->Send(new BrowserPluginMsg_AllocateInstanceIDResponse(
+      render_view_host_->GetRoutingID(), request_id, instance_id));
+}
+
 void BrowserPluginEmbedder::OnCreateGuest(
     int instance_id,
     const BrowserPluginHostMsg_CreateGuest_Params& params) {
   CreateGuest(instance_id, MSG_ROUTING_NONE, NULL, params);
+  if (params.src.empty())

[Charlie Reis, 2013/01/18 01:54:31]

Nice.  Can you update the comment in the .h file to say that this will navigate
the guest if the params has a src?

(Also, I'm fine with it as is, but is there a reason you put the check here
instead of inside CreateGuest?)

[Fady Samuel, 2013/01/18 02:23:10]

Not really, I guess. window.open uses CreateGuest too, but it does the
navigation from the guest process, instead of here. However, we can simply keep
the src parameter empty for the window.open case so we don't do an extra
navigation request.

+    return;
+  BrowserPluginHostMsg_NavigateGuest navigate_msg(
+      render_view_host_->GetRoutingID(), instance_id, params.src);
+  GetGuestByInstanceID(instance_id)->
+      OnMessageReceivedFromEmbedder(navigate_msg);
 }
 
 void BrowserPluginEmbedder::OnPluginAtPositionResponse(