Support frame tree propagation between renderers in the same browsing instance.

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 2728 matching lines @@
 
   // Update the URL display.
   NotifyNavigationStateChanged(content::INVALIDATE_TYPE_URL);
 }
 
 void WebContentsImpl::DidChangeLoadProgress(double progress) {
   if (delegate_)
     delegate_->LoadProgressChanged(this, progress);
 }
 
+void WebContentsImpl::DidUpdateFrameTree(RenderViewHost* rvh) {
+  render_manager_.DidUpdateFrameTree(rvh);
+}
+
 void WebContentsImpl::DocumentAvailableInMainFrame(
     RenderViewHost* render_view_host) {
   FOR_EACH_OBSERVER(WebContentsObserver, observers_,
                     DocumentAvailableInMainFrame());
 }
 
 void WebContentsImpl::DocumentOnLoadCompletedInMainFrame(
     RenderViewHost* render_view_host,
     int32 page_id) {
   content::NotificationService::current()->Notify(
@@ skipping 74 matching lines @@
 void WebContentsImpl::RouteMessageEvent(
     RenderViewHost* rvh,
     const ViewMsg_PostMessage_Params& params) {
   // Only deliver the message to the active RenderViewHost if the request
   // came from a RenderViewHost in the same BrowsingInstance.
   if (!rvh->GetSiteInstance()->IsRelatedSiteInstance(GetSiteInstance()))
     return;
 
   ViewMsg_PostMessage_Params new_params(params);
 
+  // If the renderer has changed while the post message is being routed,
+  // drop the message, as it will not be delivered to the right target.
+  if (GetRenderViewHost()->GetProcess()->GetID() != params.target_process_id)
+    return;
+  DCHECK(params.target_frame_id != 0);
+
   // If there is a source_routing_id, translate it to the routing ID for
   // the equivalent swapped out RVH in the target process.  If we need
   // to create a swapped out RVH for the source tab, we create its opener
   // chain as well, since those will also be accessible to the target page.
   if (new_params.source_routing_id != MSG_ROUTING_NONE) {
     // Try to look up the WebContents for the source page.
     WebContentsImpl* source_contents = NULL;
     RenderViewHostImpl* source_rvh = RenderViewHostImpl::FromID(
         rvh->GetProcess()->GetID(), params.source_routing_id);
     if (source_rvh) {
@@ skipping 227 matching lines @@
 }
 
 int WebContentsImpl::CreateOpenerRenderViews(SiteInstance* instance) {
   int opener_route_id = MSG_ROUTING_NONE;
 
   // If this tab has an opener, ensure it has a RenderView in the given
   // SiteInstance as well.
   if (opener_)
     opener_route_id = opener_->CreateOpenerRenderViews(instance);
 
+  // If any of the renderers for this WebContents has the same SiteInstance,
+  // use it.
+  if (render_manager_.current_host()->GetSiteInstance() == instance)
+    return render_manager_.current_host()->GetRoutingID();
+
+  RenderViewHostImpl* rvh = render_manager_.GetSwappedOutRenderViewHost(
+      instance);
+  if (rvh)
+    return rvh->GetRoutingID();
+
   // Create a swapped out RenderView in the given SiteInstance if none exists,
   // setting its opener to the given route_id.  Return the new view's route_id.
   return render_manager_.CreateRenderView(instance, opener_route_id, true);
 }
 
 NavigationControllerImpl& WebContentsImpl::GetControllerForRenderManager() {
   return GetController();
 }
 
 WebUIImpl* WebContentsImpl::CreateWebUIForRenderManager(const GURL& url) {
@@ skipping 111 matching lines @@
       old_browser_plugin_host()->embedder_render_process_host();
   *embedder_container_id = old_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);
   }
 }