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

content/browser/web_contents/web_contents_impl.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/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 180 matching lines @@
     return ViewMsg_Navigate_Type::RESTORE;
   }
 
   return ViewMsg_Navigate_Type::NORMAL;
 }
 
 void MakeNavigateParams(const NavigationEntryImpl& entry,
                         const NavigationControllerImpl& controller,
                         content::WebContentsDelegate* delegate,
                         NavigationController::ReloadType reload_type,
+                        const std::string& embedder_channel_name,
+                        int embedder_container_id,
                         ViewMsg_Navigate_Params* params) {
   params->page_id = entry.GetPageID();
   params->pending_history_list_offset = controller.GetIndexOfEntry(&entry);
   params->current_history_list_offset = controller.GetLastCommittedEntryIndex();
   params->current_history_list_length = controller.GetEntryCount();
   params->url = entry.GetURL();
   params->referrer = entry.GetReferrer();
   params->transition = entry.GetTransitionType();
   params->state = entry.GetContentState();
   params->navigation_type =
       GetNavigationType(controller.GetBrowserContext(), entry, reload_type);
   params->request_time = base::Time::Now();
   params->extra_headers = entry.extra_headers();
   params->transferred_request_child_id =
       entry.transferred_global_request_id().child_id;
   params->transferred_request_request_id =
       entry.transferred_global_request_id().request_id;
   // Avoid downloading when in view-source mode.
   params->allow_download = !entry.IsViewSourceMode();
+  params->embedder_channel_name = embedder_channel_name;
+  params->embedder_container_id = embedder_container_id;
 
   if (delegate)
     delegate->AddNavigationHeaders(params->url, &params->extra_headers);
 }
 
 int GetSwitchValueAsInt(
     const CommandLine& command_line,
     const std::string& switch_string,
     int min_value) {
   std::string string_value = command_line.GetSwitchValueASCII(switch_string);
@@ skipping 914 matching lines @@
     content::GetContentClient()->SetActiveURL(entry.GetURL());
     CHECK(0);
   }
 
   // Tell DevTools agent that it is attached prior to the navigation.
   DevToolsManagerImpl::GetInstance()->OnNavigatingToPendingEntry(
       GetRenderViewHost(),
       dest_render_view_host,
       entry.GetURL());
 
-  // Tell BrowserPluginHost about the pending cross-process navigation.
-  // TODO(fsamuel): Remove this once this issue is addressed:
-  // https://code.google.com/p/chromium/issues/detail?id=128976
-  browser_plugin_host()->OnPendingNavigation(dest_render_view_host);
-
   // Used for page load time metrics.
   current_load_start_ = base::TimeTicks::Now();
 
   // Navigate in the desired RenderViewHost.
+  std::string embedder_channel_name;
+  int embedder_container_id;
+  GetBrowserPluginEmbedderInfo(dest_render_view_host,
+                               &embedder_channel_name,
+                               &embedder_container_id);
   ViewMsg_Navigate_Params navigate_params;
   MakeNavigateParams(entry, controller_, delegate_, reload_type,
+                     embedder_channel_name,
+                     embedder_container_id,
                      &navigate_params);
   dest_render_view_host->Navigate(navigate_params);
 
   if (entry.GetPageID() == -1) {
     // HACK!!  This code suppresses javascript: URLs from being added to
     // session history, which is what we want to do for javascript: URLs that
     // do not generate content.  What we really need is a message from the
     // renderer telling us that a new page was not created.  The same message
     // could be used for mailto: URLs and the like.
     if (entry.GetURL().SchemeIs(chrome::kJavaScriptScheme))
@@ skipping 1554 matching lines @@
 
   // Now that the RenderView has been created, we need to tell it its size.
   if (rwh_view)
     rwh_view->SetSize(view_->GetContainerSize());
 
   // Make sure we use the correct starting page_id in the new RenderView.
   UpdateMaxPageIDIfNecessary(render_view_host);
   int32 max_page_id =
       GetMaxPageIDForSiteInstance(render_view_host->GetSiteInstance());
 
-  content::RenderProcessHost* embedder_render_process_host =
-      browser_plugin_host()->embedder_render_process_host();
-  int embedder_process_id =
-      embedder_render_process_host ? embedder_render_process_host->GetID() : -1;
+  std::string embedder_channel_name;
+  int embedder_container_id;
+  GetBrowserPluginEmbedderInfo(render_view_host,
+                               &embedder_channel_name,
+                               &embedder_container_id);
   if (!static_cast<RenderViewHostImpl*>(
           render_view_host)->CreateRenderView(string16(),
                                               opener_route_id,
                                               max_page_id,
-                                              embedder_process_id)) {
+                                              embedder_channel_name,
+                                              embedder_container_id)) {
     return false;
   }
 
 #if defined(OS_LINUX) || defined(OS_OPENBSD)
   // Force a ViewMsg_Resize to be sent, needed to make plugins show up on
   // linux. See crbug.com/83941.
   if (rwh_view) {
     if (RenderWidgetHost* render_widget_host = rwh_view->GetRenderWidgetHost())
       render_widget_host->WasResized();
   }
@@ skipping 51 matching lines @@
 void WebContentsImpl::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
   RenderWidgetHostView* rwh_view = GetView()->CreateViewForWidget(rvh);
   // Can be NULL during tests.
   if (rwh_view)
     rwh_view->SetSize(GetView()->GetContainerSize());
 }
 
 RenderViewHostImpl* WebContentsImpl::GetRenderViewHostImpl() {
   return static_cast<RenderViewHostImpl*>(GetRenderViewHost());
 }
+
+void WebContentsImpl::GetBrowserPluginEmbedderInfo(
+    content::RenderViewHost* render_view_host,
+    std::string* embedder_channel_name,
+    int* embedder_container_id) {
+  content::RenderProcessHost* embedder_render_process_host =
+      browser_plugin_host()->embedder_render_process_host();
+  *embedder_container_id = browser_plugin_host()->instance_id();
+  int embedder_process_id =
+      embedder_render_process_host ? embedder_render_process_host->GetID() : -1;
+  if (embedder_process_id != -1) {
+    *embedder_channel_name =
+        StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(),
+                     embedder_process_id);
+  }
+}