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/child/webmessageportchannel_impl.h" | 10 #include "content/child/webmessageportchannel_impl.h" |
11 #include "content/common/frame_messages.h" | 11 #include "content/common/frame_messages.h" |
| 12 #include "content/common/frame_replication_state.h" |
12 #include "content/common/swapped_out_messages.h" | 13 #include "content/common/swapped_out_messages.h" |
13 #include "content/common/view_messages.h" | 14 #include "content/common/view_messages.h" |
14 #include "content/renderer/child_frame_compositing_helper.h" | 15 #include "content/renderer/child_frame_compositing_helper.h" |
15 #include "content/renderer/render_frame_impl.h" | 16 #include "content/renderer/render_frame_impl.h" |
16 #include "content/renderer/render_thread_impl.h" | 17 #include "content/renderer/render_thread_impl.h" |
17 #include "content/renderer/render_view_impl.h" | 18 #include "content/renderer/render_view_impl.h" |
| 19 #include "third_party/WebKit/public/platform/WebString.h" |
18 #include "third_party/WebKit/public/web/WebLocalFrame.h" | 20 #include "third_party/WebKit/public/web/WebLocalFrame.h" |
19 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h" | 21 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h" |
20 #include "third_party/WebKit/public/web/WebView.h" | 22 #include "third_party/WebKit/public/web/WebView.h" |
21 | 23 |
22 namespace content { | 24 namespace content { |
23 | 25 |
24 namespace { | 26 namespace { |
25 | 27 |
26 // Facilitates lookup of RenderFrameProxy by routing_id. | 28 // Facilitates lookup of RenderFrameProxy by routing_id. |
27 typedef std::map<int, RenderFrameProxy*> RoutingIDProxyMap; | 29 typedef std::map<int, RenderFrameProxy*> RoutingIDProxyMap; |
(...skipping 19 matching lines...) Expand all Loading... |
47 // always come from WebRemoteFrame::create and a call to WebFrame::swap must | 49 // always come from WebRemoteFrame::create and a call to WebFrame::swap must |
48 // follow later. | 50 // follow later. |
49 blink::WebRemoteFrame* web_frame = blink::WebRemoteFrame::create(proxy.get()); | 51 blink::WebRemoteFrame* web_frame = blink::WebRemoteFrame::create(proxy.get()); |
50 proxy->Init(web_frame, frame_to_replace->render_view()); | 52 proxy->Init(web_frame, frame_to_replace->render_view()); |
51 return proxy.release(); | 53 return proxy.release(); |
52 } | 54 } |
53 | 55 |
54 RenderFrameProxy* RenderFrameProxy::CreateFrameProxy( | 56 RenderFrameProxy* RenderFrameProxy::CreateFrameProxy( |
55 int routing_id, | 57 int routing_id, |
56 int parent_routing_id, | 58 int parent_routing_id, |
57 int render_view_routing_id) { | 59 int render_view_routing_id, |
| 60 const FrameReplicationState& replicated_state) { |
58 scoped_ptr<RenderFrameProxy> proxy( | 61 scoped_ptr<RenderFrameProxy> proxy( |
59 new RenderFrameProxy(routing_id, MSG_ROUTING_NONE)); | 62 new RenderFrameProxy(routing_id, MSG_ROUTING_NONE)); |
60 RenderViewImpl* render_view = NULL; | 63 RenderViewImpl* render_view = NULL; |
61 blink::WebRemoteFrame* web_frame = NULL; | 64 blink::WebRemoteFrame* web_frame = NULL; |
62 if (parent_routing_id == MSG_ROUTING_NONE) { | 65 if (parent_routing_id == MSG_ROUTING_NONE) { |
63 // Create a top level frame. | 66 // Create a top level frame. |
64 render_view = RenderViewImpl::FromRoutingID(render_view_routing_id); | 67 render_view = RenderViewImpl::FromRoutingID(render_view_routing_id); |
65 web_frame = blink::WebRemoteFrame::create(proxy.get()); | 68 web_frame = blink::WebRemoteFrame::create(proxy.get()); |
66 render_view->webview()->setMainFrame(web_frame); | 69 render_view->webview()->setMainFrame(web_frame); |
67 } else { | 70 } else { |
68 // Create a frame under an existing parent. The parent is always expected | 71 // Create a frame under an existing parent. The parent is always expected |
69 // to be a RenderFrameProxy, because navigations initiated by local frames | 72 // to be a RenderFrameProxy, because navigations initiated by local frames |
70 // should not wind up here. | 73 // should not wind up here. |
71 RenderFrameProxy* parent = | 74 RenderFrameProxy* parent = |
72 RenderFrameProxy::FromRoutingID(parent_routing_id); | 75 RenderFrameProxy::FromRoutingID(parent_routing_id); |
73 web_frame = parent->web_frame()->createRemoteChild("", proxy.get()); | 76 web_frame = parent->web_frame()->createRemoteChild("", proxy.get()); |
74 render_view = parent->render_view(); | 77 render_view = parent->render_view(); |
75 } | 78 } |
76 | 79 |
77 proxy->Init(web_frame, render_view); | 80 proxy->Init(web_frame, render_view); |
78 | 81 |
| 82 // Initialize proxy's WebRemoteFrame with the security origin and other |
| 83 // replicated information. |
| 84 proxy->SetReplicatedState(replicated_state); |
| 85 |
79 return proxy.release(); | 86 return proxy.release(); |
80 } | 87 } |
81 | 88 |
82 // static | 89 // static |
83 RenderFrameProxy* RenderFrameProxy::FromRoutingID(int32 routing_id) { | 90 RenderFrameProxy* RenderFrameProxy::FromRoutingID(int32 routing_id) { |
84 RoutingIDProxyMap* proxies = g_routing_id_proxy_map.Pointer(); | 91 RoutingIDProxyMap* proxies = g_routing_id_proxy_map.Pointer(); |
85 RoutingIDProxyMap::iterator it = proxies->find(routing_id); | 92 RoutingIDProxyMap::iterator it = proxies->find(routing_id); |
86 return it == proxies->end() ? NULL : it->second; | 93 return it == proxies->end() ? NULL : it->second; |
87 } | 94 } |
88 | 95 |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 std::pair<FrameMap::iterator, bool> result = | 141 std::pair<FrameMap::iterator, bool> result = |
135 g_frame_map.Get().insert(std::make_pair(web_frame_, this)); | 142 g_frame_map.Get().insert(std::make_pair(web_frame_, this)); |
136 CHECK(result.second) << "Inserted a duplicate item."; | 143 CHECK(result.second) << "Inserted a duplicate item."; |
137 } | 144 } |
138 | 145 |
139 void RenderFrameProxy::DidCommitCompositorFrame() { | 146 void RenderFrameProxy::DidCommitCompositorFrame() { |
140 if (compositing_helper_.get()) | 147 if (compositing_helper_.get()) |
141 compositing_helper_->DidCommitCompositorFrame(); | 148 compositing_helper_->DidCommitCompositorFrame(); |
142 } | 149 } |
143 | 150 |
| 151 void RenderFrameProxy::SetReplicatedState(const FrameReplicationState& state) { |
| 152 DCHECK(web_frame_); |
| 153 web_frame_->setReplicatedOrigin(blink::WebSecurityOrigin::createFromString( |
| 154 blink::WebString::fromUTF8(state.origin.string()))); |
| 155 } |
| 156 |
144 bool RenderFrameProxy::OnMessageReceived(const IPC::Message& msg) { | 157 bool RenderFrameProxy::OnMessageReceived(const IPC::Message& msg) { |
145 bool handled = true; | 158 bool handled = true; |
146 IPC_BEGIN_MESSAGE_MAP(RenderFrameProxy, msg) | 159 IPC_BEGIN_MESSAGE_MAP(RenderFrameProxy, msg) |
147 IPC_MESSAGE_HANDLER(FrameMsg_DeleteProxy, OnDeleteProxy) | 160 IPC_MESSAGE_HANDLER(FrameMsg_DeleteProxy, OnDeleteProxy) |
148 IPC_MESSAGE_HANDLER(FrameMsg_ChildFrameProcessGone, OnChildFrameProcessGone) | 161 IPC_MESSAGE_HANDLER(FrameMsg_ChildFrameProcessGone, OnChildFrameProcessGone) |
149 IPC_MESSAGE_HANDLER_GENERIC(FrameMsg_CompositorFrameSwapped, | 162 IPC_MESSAGE_HANDLER_GENERIC(FrameMsg_CompositorFrameSwapped, |
150 OnCompositorFrameSwapped(msg)) | 163 OnCompositorFrameSwapped(msg)) |
151 IPC_MESSAGE_HANDLER(FrameMsg_DisownOpener, OnDisownOpener) | 164 IPC_MESSAGE_HANDLER(FrameMsg_DisownOpener, OnDisownOpener) |
152 IPC_MESSAGE_UNHANDLED(handled = false) | 165 IPC_MESSAGE_UNHANDLED(handled = false) |
153 IPC_END_MESSAGE_MAP() | 166 IPC_END_MESSAGE_MAP() |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
281 blink::WebUserGestureIndicator::isProcessingUserGesture(); | 294 blink::WebUserGestureIndicator::isProcessingUserGesture(); |
282 blink::WebUserGestureIndicator::consumeUserGesture(); | 295 blink::WebUserGestureIndicator::consumeUserGesture(); |
283 Send(new FrameHostMsg_OpenURL(routing_id_, params)); | 296 Send(new FrameHostMsg_OpenURL(routing_id_, params)); |
284 } | 297 } |
285 | 298 |
286 void RenderFrameProxy::forwardInputEvent(const blink::WebInputEvent* event) { | 299 void RenderFrameProxy::forwardInputEvent(const blink::WebInputEvent* event) { |
287 Send(new FrameHostMsg_ForwardInputEvent(routing_id_, event)); | 300 Send(new FrameHostMsg_ForwardInputEvent(routing_id_, event)); |
288 } | 301 } |
289 | 302 |
290 } // namespace | 303 } // namespace |
OLD | NEW |