Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(236)

Side by Side Diff: content/renderer/render_frame_proxy.cc

Issue 692973005: Pass origin information for remote frame creation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
18 #include "third_party/WebKit/public/web/WebLocalFrame.h" 19 #include "third_party/WebKit/public/web/WebLocalFrame.h"
19 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h" 20 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
20 #include "third_party/WebKit/public/web/WebView.h" 21 #include "third_party/WebKit/public/web/WebView.h"
21 22
(...skipping 25 matching lines...) Expand all
47 // always come from WebRemoteFrame::create and a call to WebFrame::swap must 48 // always come from WebRemoteFrame::create and a call to WebFrame::swap must
48 // follow later. 49 // follow later.
49 blink::WebRemoteFrame* web_frame = blink::WebRemoteFrame::create(proxy.get()); 50 blink::WebRemoteFrame* web_frame = blink::WebRemoteFrame::create(proxy.get());
50 proxy->Init(web_frame, frame_to_replace->render_view()); 51 proxy->Init(web_frame, frame_to_replace->render_view());
51 return proxy.release(); 52 return proxy.release();
52 } 53 }
53 54
54 RenderFrameProxy* RenderFrameProxy::CreateFrameProxy( 55 RenderFrameProxy* RenderFrameProxy::CreateFrameProxy(
55 int routing_id, 56 int routing_id,
56 int parent_routing_id, 57 int parent_routing_id,
57 int render_view_routing_id) { 58 int render_view_routing_id,
59 const FrameReplicationState& replicated_state) {
58 scoped_ptr<RenderFrameProxy> proxy( 60 scoped_ptr<RenderFrameProxy> proxy(
59 new RenderFrameProxy(routing_id, MSG_ROUTING_NONE)); 61 new RenderFrameProxy(routing_id, MSG_ROUTING_NONE));
60 RenderViewImpl* render_view = NULL; 62 RenderViewImpl* render_view = NULL;
61 blink::WebRemoteFrame* web_frame = NULL; 63 blink::WebRemoteFrame* web_frame = NULL;
62 if (parent_routing_id == MSG_ROUTING_NONE) { 64 if (parent_routing_id == MSG_ROUTING_NONE) {
63 // Create a top level frame. 65 // Create a top level frame.
64 render_view = RenderViewImpl::FromRoutingID(render_view_routing_id); 66 render_view = RenderViewImpl::FromRoutingID(render_view_routing_id);
65 web_frame = blink::WebRemoteFrame::create(proxy.get()); 67 web_frame = blink::WebRemoteFrame::create(proxy.get());
66 render_view->webview()->setMainFrame(web_frame); 68 render_view->webview()->setMainFrame(web_frame);
67 } else { 69 } else {
68 // Create a frame under an existing parent. The parent is always expected 70 // Create a frame under an existing parent. The parent is always expected
69 // to be a RenderFrameProxy, because navigations initiated by local frames 71 // to be a RenderFrameProxy, because navigations initiated by local frames
70 // should not wind up here. 72 // should not wind up here.
71 RenderFrameProxy* parent = 73 RenderFrameProxy* parent =
72 RenderFrameProxy::FromRoutingID(parent_routing_id); 74 RenderFrameProxy::FromRoutingID(parent_routing_id);
73 web_frame = parent->web_frame()->createRemoteChild("", proxy.get()); 75 web_frame = parent->web_frame()->createRemoteChild("", proxy.get());
74 render_view = parent->render_view(); 76 render_view = parent->render_view();
75 } 77 }
76 78
79 // initialize remote frame with the security origin that was passed to us
Charlie Reis 2014/11/13 18:00:58 nit: Capitalize nit: RemoteFrame
alexmos 2014/11/18 18:25:33 Done.
80 // from the process that is now rendering the frame.
81 web_frame->setReplicatedOrigin(
Charlie Reis 2014/11/13 18:00:58 We should probably have a more general method for
alexmos 2014/11/18 18:25:33 Done. Created a static method RenderFrameImpl::Se
82 blink::WebURL(GURL(replicated_state.origin.string())),
83 replicated_state.is_unique_origin);
84
77 proxy->Init(web_frame, render_view); 85 proxy->Init(web_frame, render_view);
78 86
79 return proxy.release(); 87 return proxy.release();
80 } 88 }
81 89
82 // static 90 // static
83 RenderFrameProxy* RenderFrameProxy::FromRoutingID(int32 routing_id) { 91 RenderFrameProxy* RenderFrameProxy::FromRoutingID(int32 routing_id) {
84 RoutingIDProxyMap* proxies = g_routing_id_proxy_map.Pointer(); 92 RoutingIDProxyMap* proxies = g_routing_id_proxy_map.Pointer();
85 RoutingIDProxyMap::iterator it = proxies->find(routing_id); 93 RoutingIDProxyMap::iterator it = proxies->find(routing_id);
86 return it == proxies->end() ? NULL : it->second; 94 return it == proxies->end() ? NULL : it->second;
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 blink::WebUserGestureIndicator::isProcessingUserGesture(); 299 blink::WebUserGestureIndicator::isProcessingUserGesture();
292 blink::WebUserGestureIndicator::consumeUserGesture(); 300 blink::WebUserGestureIndicator::consumeUserGesture();
293 Send(new FrameHostMsg_OpenURL(routing_id_, params)); 301 Send(new FrameHostMsg_OpenURL(routing_id_, params));
294 } 302 }
295 303
296 void RenderFrameProxy::forwardInputEvent(const blink::WebInputEvent* event) { 304 void RenderFrameProxy::forwardInputEvent(const blink::WebInputEvent* event) {
297 Send(new FrameHostMsg_ForwardInputEvent(routing_id_, event)); 305 Send(new FrameHostMsg_ForwardInputEvent(routing_id_, event));
298 } 306 }
299 307
300 } // namespace 308 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698