GuestView: Fix message routing across embedder navigations

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/values.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ skipping 80 matching lines @@
   return false;
 }
 
 void BrowserPluginEmbedder::DidSendScreenRects() {
   GetBrowserPluginGuestManager()->ForEachGuest(
           GetWebContents(), base::Bind(
               &BrowserPluginEmbedder::DidSendScreenRectsCallback));
 }
 
 bool BrowserPluginEmbedder::OnMessageReceived(const IPC::Message& message) {
+  return OnMessageReceived(message, nullptr);
+}
+
+bool BrowserPluginEmbedder::OnMessageReceived(
+    const IPC::Message& message,
+    RenderFrameHost* render_frame_host) {
   bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(BrowserPluginEmbedder, message)
+  IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(BrowserPluginEmbedder, message,
+                                   render_frame_host)
     IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_Attach, OnAttach)
     IPC_MESSAGE_HANDLER_GENERIC(DragHostMsg_UpdateDragCursor,
                                 OnUpdateDragCursor(&handled));
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void BrowserPluginEmbedder::DragSourceEndedAt(int client_x, int client_y,
     int screen_x, int screen_y, blink::WebDragOperation operation) {
@@ skipping 15 matching lines @@
 
   guest_dragging_over_.reset();
   ClearGuestDragStateIfApplicable();
 }
 
 void BrowserPluginEmbedder::OnUpdateDragCursor(bool* handled) {
   *handled = (guest_dragging_over_.get() != NULL);
 }
 
 void BrowserPluginEmbedder::OnAttach(
+    RenderFrameHost* render_frame_host,
     int browser_plugin_instance_id,
     const BrowserPluginHostMsg_Attach_Params& params) {
+  int owner_process_id = render_frame_host ?

[Charlie Reis, 2015/02/13 21:21:56]

I don't think we should support the case that this message arrives without going
through RFH, if we're depending on that to get the process ID correct.  We
should probably return early if render_frame_host doesn't exist.

And actually, it looks like this won't work yet.  BrowserPluginHostMsg_Attach is
sent using a render_view_routing_id_ (in browser_plugin.cc), so it never goes
through RFH.

[Fady Samuel, 2015/02/13 22:31:25]

Using the GetWebContents()->GetRenderProcessHost()->GetID() for now and added
TODO.

+      render_frame_host->GetProcess()->GetID() :
+      GetWebContents()->GetRenderProcessHost()->GetID();
+
   WebContents* guest_web_contents =
       GetBrowserPluginGuestManager()->GetGuestByInstanceID(
-          GetWebContents(), browser_plugin_instance_id);
+          owner_process_id,
+          browser_plugin_instance_id);
   if (!guest_web_contents)
     return;
   BrowserPluginGuest* guest = static_cast<WebContentsImpl*>(guest_web_contents)
                                   ->GetBrowserPluginGuest();
   guest->Attach(browser_plugin_instance_id, GetWebContents(), params);
 }
 
 bool BrowserPluginEmbedder::HandleKeyboardEvent(
     const NativeWebKeyboardEvent& event) {
   if ((event.windowsKeyCode != ui::VKEY_ESCAPE) ||
@@ skipping 58 matching lines @@
   if (static_cast<WebContentsImpl*>(guest)->GetBrowserPluginGuest()
           ->StopFinding(action)) {
     // There can only ever currently be one browser plugin that handles find so
     // we can break the iteration at this point.
     return true;
   }
   return false;
 }
 
 }  // namespace content