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

Side by Side Diff: content/browser/frame_host/frame_tree.h

Issue 917793006: Resetting FrameTreeNode must remove child FrameTreeNodes from global map. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 #ifndef CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_H_
6 #define CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 // it safe to remove children during the callback. 69 // it safe to remove children during the callback.
70 void ForEach(const base::Callback<bool(FrameTreeNode*)>& on_node) const; 70 void ForEach(const base::Callback<bool(FrameTreeNode*)>& on_node) const;
71 71
72 // Frame tree manipulation routines. 72 // Frame tree manipulation routines.
73 RenderFrameHostImpl* AddFrame(FrameTreeNode* parent, 73 RenderFrameHostImpl* AddFrame(FrameTreeNode* parent,
74 int process_id, 74 int process_id,
75 int new_routing_id, 75 int new_routing_id,
76 const std::string& frame_name); 76 const std::string& frame_name);
77 void RemoveFrame(FrameTreeNode* child); 77 void RemoveFrame(FrameTreeNode* child);
78 78
79 // This method only removes the FrameTreeNode from the global map of ids
Charlie Reis 2015/02/12 17:12:43 It feels a bit odd to have a public method for mod
nasko 2015/02/12 23:21:08 Done.
80 // to objects.
81 void RemoveNodeFromMap(int64 frame_tree_node_id);
82
79 // This method walks the entire frame tree and creates a RenderFrameProxyHost 83 // This method walks the entire frame tree and creates a RenderFrameProxyHost
80 // for the given |site_instance| in each node except the |source| one -- 84 // for the given |site_instance| in each node except the |source| one --
81 // the source will have a RenderFrameHost. It assumes that no frame tree 85 // the source will have a RenderFrameHost. It assumes that no frame tree
82 // nodes already have RenderFrameProxyHost for the given |site_instance|. 86 // nodes already have RenderFrameProxyHost for the given |site_instance|.
83 void CreateProxiesForSiteInstance( 87 void CreateProxiesForSiteInstance(
84 FrameTreeNode* source, 88 FrameTreeNode* source,
85 SiteInstance* site_instance); 89 SiteInstance* site_instance);
86 90
87 // Clears process specific-state after a main frame process swap. 91 // Clears process specific-state after a main frame process swap.
88 // This destroys most of the frame tree but retains the root node so that 92 // This destroys most of the frame tree but retains the root node so that
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 int64 focused_frame_tree_node_id_; 167 int64 focused_frame_tree_node_id_;
164 168
165 base::Callback<void(RenderFrameHost*)> on_frame_removed_; 169 base::Callback<void(RenderFrameHost*)> on_frame_removed_;
166 170
167 DISALLOW_COPY_AND_ASSIGN(FrameTree); 171 DISALLOW_COPY_AND_ASSIGN(FrameTree);
168 }; 172 };
169 173
170 } // namespace content 174 } // namespace content
171 175
172 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_H_ 176 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/frame_host/frame_tree.cc » ('j') | content/browser/frame_host/frame_tree_node.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698