Browser Plugin: Allocate Instance IDs in BrowserPluginEmbedder instead of BrowserPluginManager

content/browser/browser_plugin/browser_plugin_embedder.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/browser/browser_plugin/browser_plugin_embedder.h"
 
 #include "base/stl_util.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/browser_plugin/browser_plugin_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
@@ skipping 13 matching lines @@
 
 // static
 BrowserPluginHostFactory* BrowserPluginEmbedder::factory_ = NULL;
 
 BrowserPluginEmbedder::BrowserPluginEmbedder(
     WebContentsImpl* web_contents,
     RenderViewHost* render_view_host)
     : 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,
                  NOTIFICATION_WEB_CONTENTS_VISIBILITY_CHANGED,
                  Source<WebContents>(web_contents));
 }
 
 BrowserPluginEmbedder::~BrowserPluginEmbedder() {
   CleanUp();
 }
@@ skipping 159 matching lines @@
     // All allowed messages must have instance_id as their first parameter.
     PickleIterator iter(message);
     bool success = iter.ReadInt(&instance_id);
     DCHECK(success);
     BrowserPluginGuest* guest = GetGuestByInstanceID(instance_id);
     if (guest && guest->OnMessageReceivedFromEmbedder(message))
       return true;
   }
   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,
                         OnPluginAtPositionResponse)
     IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_PluginDestroyed,
                         OnPluginDestroyed)
     IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_BuffersSwappedACK,
                         OnSwapBuffersACK)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
@@ skipping 63 matching lines @@
     case BrowserPluginHostMsg_Stop::ID:
     case BrowserPluginHostMsg_TerminateGuest::ID:
     case BrowserPluginHostMsg_UpdateRect_ACK::ID:
       return true;
     default:
       break;
   }
   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(
     int instance_id, int request_id, const gfx::Point& position) {
   const std::map<int, WebContents::GetRenderViewHostCallback>::iterator
       callback_iter = pending_get_render_view_callbacks_.find(request_id);
   if (callback_iter == pending_get_render_view_callbacks_.end())
     return;
 
   RenderViewHost* render_view_host;
@@ skipping 17 matching lines @@
                                              uint32 sync_point) {
   AcceleratedSurfaceMsg_BufferPresented_Params ack_params;
   ack_params.mailbox_name = mailbox_name;
   ack_params.sync_point = sync_point;
   RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id,
                                                  gpu_host_id,
                                                  ack_params);
 }
 
 }  // namespace content