Set correct viewport size for an out of process iframe.

content/browser/frame_host/render_frame_host_manager.cc

 // Copyright 2013 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/frame_host/render_frame_host_manager.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 507 matching lines @@
   // no longer on the stack when we send the SwapOut message.
   delegate_->CancelModalDialogsForRenderManager();
 
   // Tell the old renderer it is being swapped out.  This will fire the unload
   // handler (without firing the beforeunload handler a second time).  When the
   // unload handler finishes and the navigation completes, we will send a
   // message to the ResourceDispatcherHost, allowing the pending RVH's response
   // to resume.
   // Note: This must be done on the RFH or else we'll swap out the top-level
   // page when subframes navigate.
-  if (frame_tree_node_->IsMainFrame())
+  if (frame_tree_node_->IsMainFrame()) {
     render_frame_host_->render_view_host()->SwapOut();
-  else
+  } else {
+    // The RenderFrameHost being swapped out becomes the proxy for this
+    // frame in its parent's process.

[Charlie Reis, 2014/02/04 20:11:12]

I think there's something more to explain in this comment, since it's a bit
subtle: if we do a second cross-process navigation in the subframe, we don't
reset the connector.  Only the first cross-process subframe navigation needs the
connector, because that's when it leaves the parent's process.  (Hence the
conditional on line 534.)

[kenrb, 2014/02/04 21:45:03]

Done. Please check if the new comment makes sense to you.

[Charlie Reis, 2014/02/04 21:52:41]

Thanks, that's much better.

+    // TODO(kenrb): This will change when RenderFrameProxyHost is created.
+    if (!cross_process_frame_connector_)

[Charlie Reis, 2014/02/04 20:11:12]

Style nit: Needs braces.

[kenrb, 2014/02/04 21:45:03]

Done.

+      cross_process_frame_connector_ =
+          new CrossProcessFrameConnector(render_frame_host_);
     render_frame_host_->SwapOut();
+  }
 
   // ResourceDispatcherHost has told us to run the onunload handler, which
   // means it is not a download or unsafe page, and we are going to perform the
   // navigation.  Thus, we no longer need to remember that the RenderFrameHost
   // is part of a pending cross-site request.
   if (pending_render_frame_host_) {
     pending_render_frame_host_->render_view_host()->
         SetHasPendingCrossSiteRequest(false);
   }
 }
@@ skipping 347 matching lines @@
         delete cross_process_frame_connector_;
         cross_process_frame_connector_ = NULL;
       }
     }
   } else {
     // Create a new RenderFrameHost if we don't find an existing one.
     // TODO(creis): Make new_render_frame_host a scoped_ptr.
     new_render_frame_host = CreateRenderFrameHost(instance, MSG_ROUTING_NONE,
                                                   MSG_ROUTING_NONE, swapped_out,
                                                   hidden);
-    if (parent_node && !cross_process_frame_connector_) {
-      // The proxy RenderFrameHost to the parent process is either the current
-      // RenderFrameHost, or it has been added to the swapped out list.
-      // TODO(kenrb): This will change when RenderFrameProxyHost is created.
-      RenderFrameHostImpl* proxy_to_parent = render_frame_host_;
-      if (render_frame_host_->render_view_host()->GetSiteInstance() !=
-          parent_node->render_manager()->current_host()->GetSiteInstance()) {
-        GetSwappedOutRenderFrameHost(
-            parent_node->render_manager()->current_host()->GetSiteInstance());
-      }
-      CHECK(proxy_to_parent);
-      cross_process_frame_connector_ =
-          new CrossProcessFrameConnector(proxy_to_parent);
-    }
 
     // If the new RFH is swapped out already, store it.  Otherwise prevent the
     // process from exiting while we're trying to navigate in it.
     if (swapped_out) {
       swapped_out_hosts_[instance->GetId()] = new_render_frame_host;
     } else {
       new_render_frame_host->GetProcess()->AddPendingView();
     }
 
     RenderViewHostImpl* render_view_host =
@@ skipping 466 matching lines @@
     SiteInstance* instance) const {
   RenderFrameHostMap::const_iterator iter =
       swapped_out_hosts_.find(instance->GetId());
   if (iter != swapped_out_hosts_.end())
     return iter->second;
 
   return NULL;
 }
 
 }  // namespace content