Browser Plugin: Remove MapInstance from BrowserPluginHost + More cross-process navigation work

content/browser/browser_plugin/browser_plugin_host.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_host.h"
 
 #include "content/browser/browser_plugin/browser_plugin_host_helper.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/browser_plugin_messages.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents_view.h"
 #include "ppapi/proxy/ppapi_messages.h"
 
 namespace content {
 
 BrowserPluginHost::BrowserPluginHost(
     WebContentsImpl* web_contents)
     : WebContentsObserver(web_contents),
       embedder_render_process_host_(NULL),
-      instance_id_(0),
-      pending_render_view_host_(NULL) {
+      instance_id_(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));
   // Construct plumbing helpers when a new RenderViewHost is created for
   // this BrowserPluginHost's WebContentsImpl.
   registrar_.Add(this,
                  NOTIFICATION_RENDER_VIEW_HOST_CREATED_FOR_TAB,
                  Source<WebContents>(web_contents));
@@ skipping 11 matching lines @@
 }
 
 void BrowserPluginHost::RegisterContainerInstance(
     int container_id,
     BrowserPluginHost* observer) {
   DCHECK(guests_by_container_id_.find(container_id) ==
       guests_by_container_id_.end());
   guests_by_container_id_[container_id] = observer;
 }
 
-void BrowserPluginHost::OnPendingNavigation(RenderViewHost* dest_rvh) {
-  if (web_contents()->GetRenderViewHost() != dest_rvh) {
-    pending_render_view_host_ = dest_rvh;
-  }
-}
-
 bool BrowserPluginHost::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(BrowserPluginHost, message)
     IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_NavigateFromGuest,
                         OnNavigateFromGuest)
-    IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_MapInstance,
-                        OnMapInstance)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void BrowserPluginHost::NavigateGuestFromEmbedder(
     RenderViewHost* render_view_host,
     int container_instance_id,
     long long frame_id,
-    const std::string& src,
-    const gfx::Size& size) {
+    const std::string& src) {
   BrowserPluginHost* guest_observer =
       GetGuestByContainerID(container_instance_id);
   WebContentsImpl* guest_web_contents =
       guest_observer ?
           static_cast<WebContentsImpl*>(guest_observer->web_contents()): NULL;
   if (!guest_observer) {
     guest_web_contents =
         static_cast<WebContentsImpl*>(
             WebContents::Create(
                 web_contents()->GetBrowserContext(),
                 render_view_host->GetSiteInstance(),
                 MSG_ROUTING_NONE,
                 NULL, // base WebContents
                 NULL  // session storage namespace
             ));
     guest_observer =
         guest_web_contents->browser_plugin_host();
     guest_observer->set_embedder_render_process_host(
         render_view_host->GetProcess());
     guest_observer->set_instance_id(container_instance_id);
-    guest_observer->set_initial_size(size);
     RegisterContainerInstance(container_instance_id, guest_observer);
     AddGuest(guest_web_contents, frame_id);
   }
-
   GURL url(src);
   guest_observer->web_contents()->SetDelegate(guest_observer);
   guest_observer->web_contents()->GetController().LoadURL(
       url,
       Referrer(),
       PAGE_TRANSITION_AUTO_SUBFRAME,
       std::string());
 }
 
 void BrowserPluginHost::OnNavigateFromGuest(
     PP_Instance instance,
     const std::string& src) {
   DCHECK(embedder_render_process_host());
   GURL url(src);
   web_contents()->GetController().LoadURL(
       url,
       Referrer(),
       PAGE_TRANSITION_AUTO_SUBFRAME,
       std::string());
 }
 
-// TODO(fsamuel): This handler is all kinds of bad and could be racy.
-// Between the time we set the pending_render_view_host and use it here,
-// the pending_render_view_host may no longer be valid and this message
-// may not go to the right place.
-// See https://code.google.com/p/chromium/issues/detail?id=128976.
-// The correct solution is probably to send
-// "BrowserPluginMsg_CompleteNavigation" over the pepper channel to the guest
-// and then have the guest send the browser "BrowserPluginHostMsg_ResizeGuest"
-// to resize appropriately.
-void BrowserPluginHost::OnMapInstance(int container_instance_id,
-                                      PP_Instance instance) {
-  BrowserPluginHost* guest_observer =
-      GetGuestByContainerID(container_instance_id);
-  WebContentsImpl* guest_web_contents =
-    static_cast<WebContentsImpl*>(guest_observer->web_contents());
-  RenderViewHost* rvh = guest_observer->pending_render_view_host() ?
-      guest_observer->pending_render_view_host() :
-          guest_web_contents->GetRenderViewHost();
-
-  guest_web_contents->GetView()->SizeContents(guest_observer->initial_size());
-
-  rvh->Send(new BrowserPluginMsg_CompleteNavigation(
-                rvh->GetRoutingID(),
-                instance));
-}
-
 void BrowserPluginHost::ConnectEmbedderToChannel(
     RenderViewHost* render_view_host,
     const IPC::ChannelHandle& channel_handle) {
   DCHECK(embedder_render_process_host());
   // Tell the BrowserPlugin in the embedder that we're done and that it can
   // begin using the guest renderer.
   embedder_render_process_host()->Send(
       new BrowserPluginMsg_LoadGuest(
           instance_id(),
           render_view_host->GetProcess()->
@@ skipping 85 matching lines @@
           web_contents->HideContents();
       }
       break;
     }
     default:
       NOTREACHED() << "Unexpected notification type: " << type;
   }
 }
 
 }  // namespace content