OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/render_frame_proxy.h" | 5 #include "content/renderer/render_frame_proxy.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 | 8 |
9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
10 #include "content/common/frame_messages.h" | 10 #include "content/common/frame_messages.h" |
(...skipping 20 matching lines...) Expand all Loading... |
31 } // namespace | 31 } // namespace |
32 | 32 |
33 // static | 33 // static |
34 RenderFrameProxy* RenderFrameProxy::CreateProxyToReplaceFrame( | 34 RenderFrameProxy* RenderFrameProxy::CreateProxyToReplaceFrame( |
35 RenderFrameImpl* frame_to_replace, | 35 RenderFrameImpl* frame_to_replace, |
36 int routing_id) { | 36 int routing_id) { |
37 CHECK_NE(routing_id, MSG_ROUTING_NONE); | 37 CHECK_NE(routing_id, MSG_ROUTING_NONE); |
38 | 38 |
39 scoped_ptr<RenderFrameProxy> proxy( | 39 scoped_ptr<RenderFrameProxy> proxy( |
40 new RenderFrameProxy(routing_id, frame_to_replace->GetRoutingID())); | 40 new RenderFrameProxy(routing_id, frame_to_replace->GetRoutingID())); |
41 #if 0 | 41 |
42 // TODO(nick): Enable this code when we're ready to create WebRemoteFrames. | |
43 blink::WebRemoteFrame* web_frame = NULL; | 42 blink::WebRemoteFrame* web_frame = NULL; |
44 if (frame_to_replace->GetWebFrame()->parent() && | 43 if (frame_to_replace->GetWebFrame()->parent() && |
45 frame_to_replace->GetWebFrame()->parent()->isWebRemoteFrame()) { | 44 frame_to_replace->GetWebFrame()->parent()->isWebRemoteFrame()) { |
46 blink::WebRemoteFrame* parent_web_frame = | 45 blink::WebRemoteFrame* parent_web_frame = |
47 frame_to_replace->GetWebFrame()->parent()->toWebRemoteFrame(); | 46 frame_to_replace->GetWebFrame()->parent()->toWebRemoteFrame(); |
48 web_frame = parent_web_frame->createRemoteChild("", proxy.get()); | 47 web_frame = parent_web_frame->createRemoteChild("", proxy.get()); |
49 } else { | 48 } else { |
50 web_frame = blink::WebRemoteFrame::create(proxy.get()); | 49 web_frame = blink::WebRemoteFrame::create(proxy.get()); |
51 } | 50 } |
52 #else | 51 |
53 blink::WebFrame* web_frame = frame_to_replace->GetWebFrame(); | |
54 #endif | |
55 proxy->Init(web_frame, frame_to_replace->render_view()); | 52 proxy->Init(web_frame, frame_to_replace->render_view()); |
56 return proxy.release(); | 53 return proxy.release(); |
57 } | 54 } |
58 | 55 |
59 RenderFrameProxy* RenderFrameProxy::CreateFrameProxy( | 56 RenderFrameProxy* RenderFrameProxy::CreateFrameProxy( |
60 int routing_id, | 57 int routing_id, |
61 int parent_routing_id, | 58 int parent_routing_id, |
62 int render_view_routing_id) { | 59 int render_view_routing_id) { |
63 scoped_ptr<RenderFrameProxy> proxy( | 60 scoped_ptr<RenderFrameProxy> proxy( |
64 new RenderFrameProxy(routing_id, MSG_ROUTING_NONE)); | 61 new RenderFrameProxy(routing_id, MSG_ROUTING_NONE)); |
65 RenderViewImpl* render_view = NULL; | 62 RenderViewImpl* render_view = NULL; |
66 blink::WebRemoteFrame* web_frame = NULL; | 63 blink::WebRemoteFrame* web_frame = NULL; |
67 if (parent_routing_id == MSG_ROUTING_NONE) { | 64 if (parent_routing_id == MSG_ROUTING_NONE) { |
68 // Create a top level frame. | 65 // Create a top level frame. |
69 render_view = RenderViewImpl::FromRoutingID(render_view_routing_id); | 66 render_view = RenderViewImpl::FromRoutingID(render_view_routing_id); |
70 web_frame = blink::WebRemoteFrame::create(proxy.get()); | 67 web_frame = blink::WebRemoteFrame::create(proxy.get()); |
71 render_view->webview()->setMainFrame(web_frame); | 68 render_view->webview()->setMainFrame(web_frame); |
72 } else { | 69 } else { |
73 // Create a frame under an existing parent. The parent is always expected to | 70 // Create a frame under an existing parent. The parent is always expected |
74 // be a RenderFrameProxy, because navigations initiated by local frames | 71 // to be a RenderFrameProxy, because navigations initiated by local frames |
75 // should not wind up here. | 72 // should not wind up here. |
76 RenderFrameProxy* parent = | 73 RenderFrameProxy* parent = |
77 RenderFrameProxy::FromRoutingID(parent_routing_id); | 74 RenderFrameProxy::FromRoutingID(parent_routing_id); |
78 CHECK(parent); | 75 web_frame = parent->web_frame()->createRemoteChild("", proxy.get()); |
79 CHECK(parent->web_frame()->isWebRemoteFrame()); | |
80 web_frame = parent->web_frame()->toWebRemoteFrame()->createRemoteChild( | |
81 "", proxy.get()); | |
82 render_view = parent->render_view(); | 76 render_view = parent->render_view(); |
83 } | 77 } |
84 | 78 |
85 proxy->Init(web_frame, render_view); | 79 proxy->Init(web_frame, render_view); |
86 | 80 |
87 return proxy.release(); | 81 return proxy.release(); |
88 } | 82 } |
89 | 83 |
90 // static | 84 // static |
91 RenderFrameProxy* RenderFrameProxy::FromRoutingID(int32 routing_id) { | 85 RenderFrameProxy* RenderFrameProxy::FromRoutingID(int32 routing_id) { |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 g_frame_map.Get().erase(it); | 119 g_frame_map.Get().erase(it); |
126 | 120 |
127 RenderThread::Get()->RemoveRoute(routing_id_); | 121 RenderThread::Get()->RemoveRoute(routing_id_); |
128 g_routing_id_proxy_map.Get().erase(routing_id_); | 122 g_routing_id_proxy_map.Get().erase(routing_id_); |
129 | 123 |
130 // TODO(nick): Call close unconditionally when web_frame() is always remote. | 124 // TODO(nick): Call close unconditionally when web_frame() is always remote. |
131 if (web_frame()->isWebRemoteFrame()) | 125 if (web_frame()->isWebRemoteFrame()) |
132 web_frame()->close(); | 126 web_frame()->close(); |
133 } | 127 } |
134 | 128 |
135 void RenderFrameProxy::Init(blink::WebFrame* web_frame, | 129 void RenderFrameProxy::Init(blink::WebRemoteFrame* web_frame, |
136 RenderViewImpl* render_view) { | 130 RenderViewImpl* render_view) { |
137 CHECK(web_frame); | 131 CHECK(web_frame); |
138 CHECK(render_view); | 132 CHECK(render_view); |
139 | 133 |
140 web_frame_ = web_frame; | 134 web_frame_ = web_frame; |
141 render_view_ = render_view; | 135 render_view_ = render_view; |
142 | 136 |
143 // TODO(nick): Should all RenderFrameProxies remain observers of their views? | 137 // TODO(nick): Should all RenderFrameProxies remain observers of their views? |
144 render_view_->RegisterRenderFrameProxy(this); | 138 render_view_->RegisterRenderFrameProxy(this); |
145 | 139 |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
226 compositing_helper_->EnableCompositing(true); | 220 compositing_helper_->EnableCompositing(true); |
227 } | 221 } |
228 compositing_helper_->OnCompositorFrameSwapped(frame.Pass(), | 222 compositing_helper_->OnCompositorFrameSwapped(frame.Pass(), |
229 param.a.producing_route_id, | 223 param.a.producing_route_id, |
230 param.a.output_surface_id, | 224 param.a.output_surface_id, |
231 param.a.producing_host_id, | 225 param.a.producing_host_id, |
232 param.a.shared_memory_handle); | 226 param.a.shared_memory_handle); |
233 } | 227 } |
234 | 228 |
235 } // namespace | 229 } // namespace |
OLD | NEW |