Re-enable SitePerProcessBrowserTest.CrossSiteIframe

content/renderer/render_frame_proxy.cc

 // Copyright 2014 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/renderer/render_frame_proxy.h"
 
 #include <map>
 
 #include "base/lazy_instance.h"
 #include "content/common/frame_messages.h"
@@ skipping 21 matching lines @@
 
 // static
 RenderFrameProxy* RenderFrameProxy::CreateProxyToReplaceFrame(
     RenderFrameImpl* frame_to_replace,
     int routing_id) {
   CHECK_NE(routing_id, MSG_ROUTING_NONE);
 
   scoped_ptr<RenderFrameProxy> proxy(
       new RenderFrameProxy(routing_id, frame_to_replace->GetRoutingID()));
 
-  blink::WebRemoteFrame* web_frame = NULL;
-  if (frame_to_replace->GetWebFrame()->parent() &&
-      frame_to_replace->GetWebFrame()->parent()->isWebRemoteFrame()) {
-    blink::WebRemoteFrame* parent_web_frame =
-        frame_to_replace->GetWebFrame()->parent()->toWebRemoteFrame();
-    web_frame = parent_web_frame->createRemoteChild("", proxy.get());
-  } else {
-    web_frame = blink::WebRemoteFrame::create(proxy.get());
-  }
-
+  // When a RenderFrame will be replaced by a RenderProxy, the WebRemoteFrame

[Charlie Reis, 2014/08/19 21:32:32]

nit: will be -> is

[nasko, 2014/08/20 14:15:17]

Done.

+  // should always come from WebRemoteFrame::create and a call to WebFrame::swap
+  // must follow later.
+  blink::WebRemoteFrame* web_frame = blink::WebRemoteFrame::create(proxy.get());

[Charlie Reis, 2014/08/19 21:32:32]

I don't fully understand why the old code was unnecessary.  If that case isn't
reachable, is there a DCHECK we could add?  Or was it just wrong before?

[nasko, 2014/08/20 14:15:17]

It was just wrong before. It was hitting an ASSERT in WebFrame::swap, which
expects a WebRemoteFrame to be created through ::create instead of
::createRemoteChild.

[Charlie Reis, 2014/08/20 17:09:37]

Acknowledged.

   proxy->Init(web_frame, frame_to_replace->render_view());
   return proxy.release();
 }
 
 RenderFrameProxy* RenderFrameProxy::CreateFrameProxy(
     int routing_id,
     int parent_routing_id,
     int render_view_routing_id) {
   scoped_ptr<RenderFrameProxy> proxy(
       new RenderFrameProxy(routing_id, MSG_ROUTING_NONE));
@@ skipping 158 matching lines @@
     compositing_helper_->EnableCompositing(true);
   }
   compositing_helper_->OnCompositorFrameSwapped(frame.Pass(),
                                                 param.a.producing_route_id,
                                                 param.a.output_surface_id,
                                                 param.a.producing_host_id,
                                                 param.a.shared_memory_handle);
 }
 
 }  // namespace