Chromium Code Reviews| 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/browser/frame_host/render_frame_proxy_host.h" | 5 #include "content/browser/frame_host/render_frame_proxy_host.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
| 10 #include "content/browser/bad_message.h" | 10 #include "content/browser/bad_message.h" |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 187 Send(new FrameMsg_NewFrameProxy(routing_id_, | 187 Send(new FrameMsg_NewFrameProxy(routing_id_, |
| 188 frame_tree_node_->frame_tree() | 188 frame_tree_node_->frame_tree() |
| 189 ->GetRenderViewHost(site_instance_.get()) | 189 ->GetRenderViewHost(site_instance_.get()) |
| 190 ->GetRoutingID(), | 190 ->GetRoutingID(), |
| 191 opener_routing_id, | 191 opener_routing_id, |
| 192 parent_routing_id, | 192 parent_routing_id, |
| 193 frame_tree_node_ | 193 frame_tree_node_ |
| 194 ->current_replication_state())); | 194 ->current_replication_state())); |
| 195 | 195 |
| 196 render_frame_proxy_created_ = true; | 196 render_frame_proxy_created_ = true; |
| 197 | |
| 198 if (frame_tree_node_->parent()) { | |
| 199 Send(new FrameMsg_SetFrameOwnerProperties( | |
|
alexmos
2016/05/02 17:44:06
On one hand this probably makes sense to send as p
| |
| 200 routing_id_, frame_tree_node_->frame_owner_properties())); | |
| 201 } | |
| 202 | |
| 197 return true; | 203 return true; |
| 198 } | 204 } |
| 199 | 205 |
| 200 void RenderFrameProxyHost::UpdateOpener() { | 206 void RenderFrameProxyHost::UpdateOpener() { |
| 201 // Another frame in this proxy's SiteInstance may reach the new opener by | 207 // Another frame in this proxy's SiteInstance may reach the new opener by |
| 202 // first reaching this proxy and then referencing its window.opener. Ensure | 208 // first reaching this proxy and then referencing its window.opener. Ensure |
| 203 // the new opener's proxy exists in this case. | 209 // the new opener's proxy exists in this case. |
| 204 if (frame_tree_node_->opener()) { | 210 if (frame_tree_node_->opener()) { |
| 205 frame_tree_node_->opener()->render_manager()->CreateOpenerProxies( | 211 frame_tree_node_->opener()->render_manager()->CreateOpenerProxies( |
| 206 GetSiteInstance(), frame_tree_node_); | 212 GetSiteInstance(), frame_tree_node_); |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 358 target_rfh->Send(new FrameMsg_AdvanceFocus(target_rfh->GetRoutingID(), type, | 364 target_rfh->Send(new FrameMsg_AdvanceFocus(target_rfh->GetRoutingID(), type, |
| 359 source_proxy_routing_id)); | 365 source_proxy_routing_id)); |
| 360 } | 366 } |
| 361 | 367 |
| 362 void RenderFrameProxyHost::OnFrameFocused() { | 368 void RenderFrameProxyHost::OnFrameFocused() { |
| 363 frame_tree_node_->frame_tree()->SetFocusedFrame(frame_tree_node_, | 369 frame_tree_node_->frame_tree()->SetFocusedFrame(frame_tree_node_, |
| 364 GetSiteInstance()); | 370 GetSiteInstance()); |
| 365 } | 371 } |
| 366 | 372 |
| 367 } // namespace content | 373 } // namespace content |
| OLD | NEW |