Browser Plugin: Allocate Instance IDs in BrowserPluginEmbedder instead of BrowserPluginManager

content/renderer/browser_plugin/browser_plugin.h

Index: content/renderer/browser_plugin/browser_plugin.h
diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/browser_plugin.h
index cdc6be0f4a629a6fc44bce540f831bc67e269479..50f536f32120eb3da6900b6e1a60f9907ec3b817 100644
--- a/content/renderer/browser_plugin/browser_plugin.h
+++ b/content/renderer/browser_plugin/browser_plugin.h
@@ -34,6 +34,7 @@ class CONTENT_EXPORT BrowserPlugin :
     NON_EXPORTED_BASE(public WebKit::WebPlugin) {
  public:
   RenderViewImpl* render_view() const { return render_view_.get(); }
+  int render_view_routing_id() const { return render_view_routing_id_; }
 
   bool OnMessageReceived(const IPC::Message& msg);
 
@@ -175,7 +176,6 @@ class CONTENT_EXPORT BrowserPlugin :
   // with the frame within which it lives and the initial attributes assigned
   // to it on creation.
   BrowserPlugin(
-      int instance_id,
       RenderViewImpl* render_view,
       WebKit::WebFrame* frame,
       const WebKit::WebPluginParams& params);
@@ -185,7 +185,6 @@ class CONTENT_EXPORT BrowserPlugin :
   int width() const { return plugin_rect_.width(); }
   int height() const { return plugin_rect_.height(); }
   int instance_id() const { return instance_id_; }
-  int render_view_routing_id() const { return render_view_routing_id_; }
   BrowserPluginManager* browser_plugin_manager() const {
     return browser_plugin_manager_;
   }
@@ -244,6 +243,7 @@ class CONTENT_EXPORT BrowserPlugin :
   // IPC message handlers.
   // Please keep in alphabetical order.
   void OnAdvanceFocus(int instance_id, bool reverse);
+  void OnAllocateInstanceIDACK(int request_id, int instance_id);

[Charlie Reis, 2013/01/18 05:36:45]

I think this should be SetInstanceID(instance_id) or Init(instance_id), rather
than being a message handler.

[Fady Samuel, 2013/01/18 15:26:25]

Fair enough. I had originally made it a message to allow BrowserPluginObservers
to see this message and perhaps do additional initialization when/if they need
to, but since BrowserPluginObservers have not yet landed and there is no
particular use case where we might want to add more initialization state (yet),
I'll switch this to SetInstanceID.

   void OnBuffersSwapped(int instance_id,
                         const gfx::Size& size,
                         std::string mailbox_name,
@@ -313,6 +313,7 @@ class CONTENT_EXPORT BrowserPlugin :
 
   gfx::Size last_view_size_;
   bool size_changed_in_flight_;
+  bool allocate_instance_id_in_flight_;
 
   // BrowserPlugin outlives RenderViewImpl in Chrome Apps and so we need to
   // store the BrowserPlugin's BrowserPluginManager in a member variable to