Chromium Code Reviews| Index: content/browser/frame_host/frame_tree.h |
| diff --git a/content/browser/frame_host/frame_tree.h b/content/browser/frame_host/frame_tree.h |
| index 3255d3bc093a35545c068df978ba50789cae2bdb..e788a43a71fb78199ea584ad0f5257e54c3bd2a6 100644 |
| --- a/content/browser/frame_host/frame_tree.h |
| +++ b/content/browser/frame_host/frame_tree.h |
| @@ -75,9 +75,9 @@ class CONTENT_EXPORT FrameTree { |
| private: |
| friend class FrameTree; |
| - NodeRange(FrameTree* tree, FrameTreeNode* node_to_skip); |
| + NodeRange(FrameTreeNode* root, FrameTreeNode* node_to_skip); |
| - FrameTree* const tree_; |
| + FrameTreeNode* const root_; |
| FrameTreeNode* const node_to_skip_; |
| }; |
| @@ -111,9 +111,9 @@ class CONTENT_EXPORT FrameTree { |
| private: |
| friend class FrameTree; |
| - ConstNodeRange(const FrameTree* tree); |
| + ConstNodeRange(const FrameTreeNode* root); |
| - const FrameTree* const tree_; |
| + const FrameTreeNode* const root_; |
| }; |
| // Each FrameTreeNode will default to using the given |navigator| for |
| @@ -148,10 +148,19 @@ class CONTENT_EXPORT FrameTree { |
| // breadth-first traversal order. |
| NodeRange Nodes(); |
| + // Returns a range to iterall over all FrameTreeNodes in a subtree of the |
|
nasko
2016/03/22 13:56:54
s/iterall/iterate/? here and below.
kenrb
2016/03/22 15:40:20
Done.
|
| + // frame tree, starting from |subtree_root|. |
| + NodeRange SubtreeNodes(FrameTreeNode* subtree_root); |
| + |
| // Returns a range to iterate over all FrameTreeNodes in the frame tree in |
| // breadth-first traversal order. All FrameTreeNodes returned will be const. |
| ConstNodeRange ConstNodes() const; |
| + // Returns a range to iterall over all FrameTreeNodes in a subtree of the |
| + // frame tree, starting from |subtree_root|. All FrameTreeNodes returned |
| + // will be const. |
| + ConstNodeRange ConstSubtreeNodes(FrameTreeNode* subtree_root); |
|
nasko
2016/03/22 13:56:54
Nick wanted to get rid of the const version. Maybe
kenrb
2016/03/22 15:40:20
Done.
|
| + |
| // Adds a new child frame to the frame tree. |process_id| is required to |
| // disambiguate |new_routing_id|, and it must match the process of the |
| // |parent| node. Otherwise no child is added and this method returns false. |