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 <stdint.h> | 7 #include <stdint.h> |
8 #include <map> | 8 #include <map> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 render_view->webview()->setMainFrame(web_frame); | 93 render_view->webview()->setMainFrame(web_frame); |
94 render_widget = render_view; | 94 render_widget = render_view; |
95 } else { | 95 } else { |
96 // Create a frame under an existing parent. The parent is always expected | 96 // Create a frame under an existing parent. The parent is always expected |
97 // to be a RenderFrameProxy, because navigations initiated by local frames | 97 // to be a RenderFrameProxy, because navigations initiated by local frames |
98 // should not wind up here. | 98 // should not wind up here. |
99 | 99 |
100 web_frame = parent->web_frame()->createRemoteChild( | 100 web_frame = parent->web_frame()->createRemoteChild( |
101 replicated_state.scope, | 101 replicated_state.scope, |
102 blink::WebString::fromUTF8(replicated_state.name), | 102 blink::WebString::fromUTF8(replicated_state.name), |
| 103 blink::WebString::fromUTF8(replicated_state.unique_name), |
103 replicated_state.sandbox_flags, proxy.get()); | 104 replicated_state.sandbox_flags, proxy.get()); |
104 render_view = parent->render_view(); | 105 render_view = parent->render_view(); |
105 render_widget = parent->render_widget(); | 106 render_widget = parent->render_widget(); |
106 } | 107 } |
107 | 108 |
108 blink::WebFrame* opener = | 109 blink::WebFrame* opener = |
109 RenderFrameImpl::ResolveOpener(opener_routing_id, nullptr); | 110 RenderFrameImpl::ResolveOpener(opener_routing_id, nullptr); |
110 web_frame->setOpener(opener); | 111 web_frame->setOpener(opener); |
111 | 112 |
112 proxy->Init(web_frame, render_view, render_widget); | 113 proxy->Init(web_frame, render_view, render_widget); |
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
496 blink::WebLocalFrame* source) { | 497 blink::WebLocalFrame* source) { |
497 int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID(); | 498 int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID(); |
498 Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id)); | 499 Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id)); |
499 } | 500 } |
500 | 501 |
501 void RenderFrameProxy::frameFocused() { | 502 void RenderFrameProxy::frameFocused() { |
502 Send(new FrameHostMsg_FrameFocused(routing_id_)); | 503 Send(new FrameHostMsg_FrameFocused(routing_id_)); |
503 } | 504 } |
504 | 505 |
505 } // namespace | 506 } // namespace |
OLD | NEW |