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

Side by Side Diff: content/browser/frame_host/render_frame_host_manager.cc

Issue 1420203007: Correctly find root RWHV from a nested WebContents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: s/if/while Created 5 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
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_host_manager.h" 5 #include "content/browser/frame_host/render_frame_host_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 309
310 FrameTreeNode* outer_contents_frame_tree_node = 310 FrameTreeNode* outer_contents_frame_tree_node =
311 FrameTreeNode::GloballyFindByID( 311 FrameTreeNode::GloballyFindByID(
312 delegate_->GetOuterDelegateFrameTreeNodeID()); 312 delegate_->GetOuterDelegateFrameTreeNodeID());
313 return outer_contents_frame_tree_node->parent() 313 return outer_contents_frame_tree_node->parent()
314 ->current_frame_host() 314 ->current_frame_host()
315 ->render_view_host() 315 ->render_view_host()
316 ->GetWidget(); 316 ->GetWidget();
317 } 317 }
318 318
319 FrameTreeNode* RenderFrameHostManager::GetOuterDelegateNode() {
320 int outer_contents_frame_tree_node_id =
321 delegate_->GetOuterDelegateFrameTreeNodeID();
322 return FrameTreeNode::GloballyFindByID(outer_contents_frame_tree_node_id);
323 }
324
319 RenderFrameProxyHost* RenderFrameHostManager::GetProxyToParent() { 325 RenderFrameProxyHost* RenderFrameHostManager::GetProxyToParent() {
320 if (frame_tree_node_->IsMainFrame()) 326 if (frame_tree_node_->IsMainFrame())
321 return nullptr; 327 return nullptr;
322 328
323 return proxy_hosts_->Get(frame_tree_node_->parent() 329 return proxy_hosts_->Get(frame_tree_node_->parent()
324 ->render_manager() 330 ->render_manager()
325 ->current_frame_host() 331 ->current_frame_host()
326 ->GetSiteInstance() 332 ->GetSiteInstance()
327 ->GetId()); 333 ->GetId());
328 } 334 }
(...skipping 2340 matching lines...) Expand 10 before | Expand all | Expand 10 after
2669 int RenderFrameHostManager::GetOpenerRoutingID(SiteInstance* instance) { 2675 int RenderFrameHostManager::GetOpenerRoutingID(SiteInstance* instance) {
2670 if (!frame_tree_node_->opener()) 2676 if (!frame_tree_node_->opener())
2671 return MSG_ROUTING_NONE; 2677 return MSG_ROUTING_NONE;
2672 2678
2673 return frame_tree_node_->opener() 2679 return frame_tree_node_->opener()
2674 ->render_manager() 2680 ->render_manager()
2675 ->GetRoutingIdForSiteInstance(instance); 2681 ->GetRoutingIdForSiteInstance(instance);
2676 } 2682 }
2677 2683
2678 } // namespace content 2684 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698