Index: content/renderer/render_frame_proxy.cc |
diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc |
index 14670716dfee75ba73d6c658a4e90db05bc3f45d..e8da0014e1ce84e6db58bb92f53f0a2785f4fba3 100644 |
--- a/content/renderer/render_frame_proxy.cc |
+++ b/content/renderer/render_frame_proxy.cc |
@@ -38,7 +38,8 @@ |
scoped_ptr<RenderFrameProxy> proxy( |
new RenderFrameProxy(routing_id, frame_to_replace->GetRoutingID())); |
- |
+#if 0 |
+ // TODO(nick): Enable this code when we're ready to create WebRemoteFrames. |
blink::WebRemoteFrame* web_frame = NULL; |
if (frame_to_replace->GetWebFrame()->parent() && |
frame_to_replace->GetWebFrame()->parent()->isWebRemoteFrame()) { |
@@ -48,7 +49,9 @@ |
} else { |
web_frame = blink::WebRemoteFrame::create(proxy.get()); |
} |
- |
+#else |
+ blink::WebFrame* web_frame = frame_to_replace->GetWebFrame(); |
+#endif |
proxy->Init(web_frame, frame_to_replace->render_view()); |
return proxy.release(); |
} |
@@ -67,12 +70,15 @@ |
web_frame = blink::WebRemoteFrame::create(proxy.get()); |
render_view->webview()->setMainFrame(web_frame); |
} else { |
- // Create a frame under an existing parent. The parent is always expected |
- // to be a RenderFrameProxy, because navigations initiated by local frames |
+ // Create a frame under an existing parent. The parent is always expected to |
+ // be a RenderFrameProxy, because navigations initiated by local frames |
// should not wind up here. |
RenderFrameProxy* parent = |
RenderFrameProxy::FromRoutingID(parent_routing_id); |
- web_frame = parent->web_frame()->createRemoteChild("", proxy.get()); |
+ CHECK(parent); |
+ CHECK(parent->web_frame()->isWebRemoteFrame()); |
+ web_frame = parent->web_frame()->toWebRemoteFrame()->createRemoteChild( |
+ "", proxy.get()); |
render_view = parent->render_view(); |
} |
@@ -126,7 +132,7 @@ |
web_frame()->close(); |
} |
-void RenderFrameProxy::Init(blink::WebRemoteFrame* web_frame, |
+void RenderFrameProxy::Init(blink::WebFrame* web_frame, |
RenderViewImpl* render_view) { |
CHECK(web_frame); |
CHECK(render_view); |