Remove stale frame ID references for RequestTransferURL.

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/debug/trace_event.h"
@@ skipping 2008 matching lines @@
 void WebContentsImpl::DidStartProvisionalLoad(
     RenderFrameHostImpl* render_frame_host,
     int parent_routing_id,
     bool is_main_frame,
     const GURL& validated_url,
     bool is_error_page,
     bool is_iframe_srcdoc) {
   if (is_main_frame)
     DidChangeLoadProgress(0);
 
+  // --site-per-process mode has a short-term hack allowing cross-process
+  // subframe pages to commit thinking they are top-level.  Correct it here to
+  // avoid confusing the observers.

[nasko, 2014/03/06 04:59:52]

Do we need this for each observer method? Or do you plan on adding it only if we
see breakage?

[Charlie Reis, 2014/03/06 06:59:50]

I'm just adding it on demand to satisfy the Web Navigation API, since we'll be
removing the hack soon enough (once we mirror the frame tree).  I don't think we
need to worry about adding it to more observers unless they come up in practice.

+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSitePerProcess) &&
+      render_frame_host != GetMainFrame()) {
+    is_main_frame = false;
+  }
+
   // Notify observers about the start of the provisional load.
   FOR_EACH_OBSERVER(WebContentsObserver, observers_,
                     DidStartProvisionalLoadForFrame(
                         render_frame_host->GetRoutingID(), parent_routing_id,
                         is_main_frame, validated_url, is_error_page,
                         is_iframe_srcdoc,
                         render_frame_host->render_view_host()));
 
   if (is_main_frame) {
     FOR_EACH_OBSERVER(
@@ skipping 51 matching lines @@
       RenderFrameHostImpl* render_frame_host,
       const GURL& url,
       NavigationController::ReloadType reload_type) {
   // Notify observers about navigation.
   FOR_EACH_OBSERVER(
       WebContentsObserver,
       observers_,
       DidStartNavigationToPendingEntry(url, reload_type));
 }
 
-void WebContentsImpl::RequestOpenURL(const OpenURLParams& params) {
+void WebContentsImpl::RequestOpenURL(RenderFrameHostImpl* render_frame_host,
+                                     const OpenURLParams& params) {
+  int source_render_frame_id = render_frame_host->GetRoutingID();
   WebContents* new_contents = OpenURL(params);
 
   if (new_contents) {
     // Notify observers.
     FOR_EACH_OBSERVER(WebContentsObserver, observers_,
                       DidOpenRequestedURL(new_contents,
                                           params.url,
                                           params.referrer,
                                           params.disposition,
                                           params.transition,
-                                          params.source_frame_id));
+                                          source_render_frame_id));
   }
 }
 
 void WebContentsImpl::DidRedirectProvisionalLoad(
     RenderFrameHostImpl* render_frame_host,
     const GURL& validated_target_url) {
   // Notify observers about the provisional change in the main frame URL.
   FOR_EACH_OBSERVER(
       WebContentsObserver,
       observers_,
@@ skipping 1473 matching lines @@
 
 void WebContentsImpl::OnPreferredSizeChanged(const gfx::Size& old_size) {
   if (!delegate_)
     return;
   const gfx::Size new_size = GetPreferredSize();
   if (new_size != old_size)
     delegate_->UpdatePreferredSize(this, new_size);
 }
 
 }  // namespace content