Delay creation of BrowserPluginMsg_X messages until after attach.

content/browser/browser_plugin/browser_plugin_guest.h

 // 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.
 
 // A BrowserPluginGuest is the browser side of a browser <--> embedder
 // renderer channel. A BrowserPlugin (a WebPlugin) is on the embedder
 // renderer side of browser <--> embedder renderer communication.
 //
 // BrowserPluginGuest lives on the UI thread of the browser process. Any
 // messages about the guest render process that the embedder might be interested
 // in receiving should be listened for here.
 //
 // BrowserPluginGuest is a WebContentsObserver for the guest WebContents.
 // BrowserPluginGuest operates under the assumption that the guest will be
 // accessible through only one RenderViewHost for the lifetime of
 // the guest WebContents. Thus, cross-process navigation is not supported.
 
 #ifndef CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_GUEST_H_
 #define CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_GUEST_H_
 
+#include <functional>
 #include <map>
 #include <queue>
 
 #include "base/compiler_specific.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 #include "content/common/edit_command.h"
 #include "content/common/input/input_event_ack_state.h"
 #include "content/public/browser/browser_plugin_guest_delegate.h"
@@ skipping 32 matching lines @@
 namespace content {
 
 class BrowserPluginGuestManager;
 class RenderViewHostImpl;
 class RenderWidgetHost;
 class RenderWidgetHostView;
 class RenderWidgetHostViewBase;
 class SiteInstance;
 struct DropData;
 
+typedef std::function<IPC::Message*(int browser_plugin_id)>

[lazyboy, 2015/10/16 00:15:48]

Guess the mac bots didn't like it. Lucas and I couldn't find any instance of
std::function in chrome/content/blink.

+    BrowserPluginMessageFunc;
+
 // A browser plugin guest provides functionality for WebContents to operate in
 // the guest role and implements guest-specific overrides for ViewHostMsg_*
 // messages.
 //
 // When a guest is initially created, it is in an unattached state. That is,
 // it is not visible anywhere and has no embedder WebContents assigned.
 // A BrowserPluginGuest is said to be "attached" if it has an embedder.
 // A BrowserPluginGuest can also create a new unattached guest via
 // CreateNewWindow. The newly created guest will live in the same partition,
 // which means it can share storage and can script this guest.
@@ skipping 112 matching lines @@
   // Therefore, the coordinates of the context menu event with respect to the
   // container window are modifed with the guest renderer process beiung unaware
   // of the change. Then eventually, when the context menu event arrives at the
   // browser, it contains the wrong coordinates (BUG=470087).
   // TODO(ekaramad): Find a more fundamental solution and remove this later.
   void SetContextMenuPosition(const gfx::Point& position);
 
   // Helper to send messages to embedder. If this guest is not yet attached,
   // then IPCs will be queued until attachment.
   void SendMessageToEmbedder(IPC::Message* msg);
+  void SendMessageToEmbedder(BrowserPluginMessageFunc msg_func);
 
   // Returns whether the guest is attached to an embedder.
   bool attached() const { return attached_; }
 
   // Returns true when an attachment has taken place since the last time the
   // compositor surface was set.
   bool has_attached_since_surface_set() const {
     return has_attached_since_surface_set_;
   }
 
@@ skipping 238 matching lines @@
   // Subsequent frames are not generated until the IPC is ACKed. We would like
   // to ensure that the guest generates frames on attachment so we directly ACK
   // an unACKed CFS. ACKs could get lost between the time a guest is detached
   // from a container and the time it is attached elsewhere. This mitigates this
   // race by ensuring the guest is ACKed on attachment.
   scoped_ptr<FrameMsg_CompositorFrameSwapped_Params> last_pending_frame_;
 
   // This is a queue of messages that are destined to be sent to the embedder
   // once the guest is attached to a particular embedder.
   std::deque<linked_ptr<IPC::Message> > pending_messages_;
+  std::deque<BrowserPluginMessageFunc> pending_message_funcs_;
 
   BrowserPluginGuestDelegate* const delegate_;
 
   // Weak pointer used to ask GeolocationPermissionContext about geolocation
   // permission.
   base::WeakPtrFactory<BrowserPluginGuest> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginGuest);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_GUEST_H_