Send initializeChildFrame from RenderFrameProxy instead of WebLocalFrame (part 2)

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 633774376fc362df32e084afdbbfda586ee446b3..1fb0093a20ab6d9fe52b3c38ce52dce1caf4ea74 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1063,19 +1063,10 @@ void RenderFrameImpl::OnSwapOut(int proxy_routing_id) {
     // frame?
     OnStop();
 
-    // Let subframes know that the frame is now rendered remotely, for the
-    // purposes of compositing and input events.
-    if (!is_main_frame) {
-      // TODO(creis): Remove setIsRemote and send initializeChildFrame from the
-      // RenderFrameProxy, since the RenderFrameHost may be deleted first.  In
-      // the meantime, temporarily set this frame's proxy so that the message
-      // is sent via RenderFrameProxy.
-      // See http://crbug.com/416102.
-      DCHECK(!render_frame_proxy_);
-      set_render_frame_proxy(proxy);
-      frame_->setIsRemote(true);
-      set_render_frame_proxy(NULL);
-    }
+    // Transfer settings such as initial drawing parameters to the remote frame
+    // that will replace this frame.
+    if (!is_main_frame)
+      proxy->web_frame()->initializeFromFrame(frame_);
 
     // Replace the page with a blank dummy URL. The unload handler will not be
     // run a second time, thanks to a check in FrameLoader::stopLoading.
@@ -3189,12 +3180,6 @@ void RenderFrameImpl::forwardInputEvent(const blink::WebInputEvent* event) {
   Send(new FrameHostMsg_ForwardInputEvent(routing_id_, event));
 }
 
-void RenderFrameImpl::initializeChildFrame(const blink::WebRect& frame_rect,
-                                           float scale_factor) {
-  render_frame_proxy_->Send(new FrameHostMsg_InitializeChildFrame(
-      routing_id_, frame_rect, scale_factor));
-}
-
 blink::WebScreenOrientationClient*
     RenderFrameImpl::webScreenOrientationClient() {
   if (!screen_orientation_dispatcher_)