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

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

Issue 2156883002: Use content::FrameOwnerProperties instead of blink::WebFrameOwnerProperties in content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permission-delegation-frame-owner-properties
Patch Set: Use this everywhere Created 4 years, 5 months 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 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/frame_tree_node.h" 5 #include "content/browser/frame_host/frame_tree_node.h"
6 6
7 #include <queue> 7 #include <queue>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 int FrameTreeNode::next_frame_tree_node_id_ = 1; 68 int FrameTreeNode::next_frame_tree_node_id_ = 1;
69 69
70 // static 70 // static
71 FrameTreeNode* FrameTreeNode::GloballyFindByID(int frame_tree_node_id) { 71 FrameTreeNode* FrameTreeNode::GloballyFindByID(int frame_tree_node_id) {
72 DCHECK_CURRENTLY_ON(BrowserThread::UI); 72 DCHECK_CURRENTLY_ON(BrowserThread::UI);
73 FrameTreeNodeIdMap* nodes = g_frame_tree_node_id_map.Pointer(); 73 FrameTreeNodeIdMap* nodes = g_frame_tree_node_id_map.Pointer();
74 FrameTreeNodeIdMap::iterator it = nodes->find(frame_tree_node_id); 74 FrameTreeNodeIdMap::iterator it = nodes->find(frame_tree_node_id);
75 return it == nodes->end() ? nullptr : it->second; 75 return it == nodes->end() ? nullptr : it->second;
76 } 76 }
77 77
78 FrameTreeNode::FrameTreeNode( 78 FrameTreeNode::FrameTreeNode(FrameTree* frame_tree,
79 FrameTree* frame_tree, 79 Navigator* navigator,
80 Navigator* navigator, 80 RenderFrameHostDelegate* render_frame_delegate,
81 RenderFrameHostDelegate* render_frame_delegate, 81 RenderWidgetHostDelegate* render_widget_delegate,
82 RenderWidgetHostDelegate* render_widget_delegate, 82 RenderFrameHostManager::Delegate* manager_delegate,
83 RenderFrameHostManager::Delegate* manager_delegate, 83 FrameTreeNode* parent,
84 FrameTreeNode* parent, 84 blink::WebTreeScopeType scope,
85 blink::WebTreeScopeType scope, 85 const std::string& name,
86 const std::string& name, 86 const std::string& unique_name,
87 const std::string& unique_name, 87 const FrameOwnerProperties& frame_owner_properties)
88 const blink::WebFrameOwnerProperties& frame_owner_properties)
89 : frame_tree_(frame_tree), 88 : frame_tree_(frame_tree),
90 navigator_(navigator), 89 navigator_(navigator),
91 render_manager_(this, 90 render_manager_(this,
92 render_frame_delegate, 91 render_frame_delegate,
93 render_widget_delegate, 92 render_widget_delegate,
94 manager_delegate), 93 manager_delegate),
95 frame_tree_node_id_(next_frame_tree_node_id_++), 94 frame_tree_node_id_(next_frame_tree_node_id_++),
96 parent_(parent), 95 parent_(parent),
97 opener_(nullptr), 96 opener_(nullptr),
98 opener_observer_(nullptr), 97 opener_observer_(nullptr),
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 } 494 }
496 return parent_->child_at(i + relative_offset); 495 return parent_->child_at(i + relative_offset);
497 } 496 }
498 } 497 }
499 498
500 NOTREACHED() << "FrameTreeNode not found in its parent's children."; 499 NOTREACHED() << "FrameTreeNode not found in its parent's children.";
501 return nullptr; 500 return nullptr;
502 } 501 }
503 502
504 } // namespace content 503 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/frame_tree_node.h ('k') | content/browser/frame_host/frame_tree_node_blame_context_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698