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

Side by Side Diff: trunk/src/content/browser/frame_host/frame_tree_node.h

Issue 163703004: Revert 250823 "With --site-per-process, avoid a crash when a sub..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | Annotate | Revision Log
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_NODE_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_
6 #define CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 28 matching lines...) Expand all
39 int64 frame_id, 39 int64 frame_id,
40 const std::string& name); 40 const std::string& name);
41 41
42 ~FrameTreeNode(); 42 ~FrameTreeNode();
43 43
44 bool IsMainFrame() const; 44 bool IsMainFrame() const;
45 45
46 void AddChild(scoped_ptr<FrameTreeNode> child, int frame_routing_id); 46 void AddChild(scoped_ptr<FrameTreeNode> child, int frame_routing_id);
47 void RemoveChild(FrameTreeNode* child); 47 void RemoveChild(FrameTreeNode* child);
48 48
49 // Clears process specific-state in this node to prepare for a new process. 49 // Clears process specific-state after a main frame process swap.
50 void ResetForNewProcess(); 50 // TODO(creis): Look into how we can remove the need for this method.
51 void ResetForMainFrameSwap();
51 52
52 FrameTree* frame_tree() const { 53 FrameTree* frame_tree() const {
53 return frame_tree_; 54 return frame_tree_;
54 } 55 }
55 56
56 Navigator* navigator() { 57 Navigator* navigator() {
57 return navigator_.get(); 58 return navigator_.get();
58 } 59 }
59 60
60 RenderFrameHostManager* render_manager() { 61 RenderFrameHostManager* render_manager() {
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 // TODO(creis): Remove this when we can store subframe URLs in the 147 // TODO(creis): Remove this when we can store subframe URLs in the
147 // NavigationController. 148 // NavigationController.
148 GURL current_url_; 149 GURL current_url_;
149 150
150 DISALLOW_COPY_AND_ASSIGN(FrameTreeNode); 151 DISALLOW_COPY_AND_ASSIGN(FrameTreeNode);
151 }; 152 };
152 153
153 } // namespace content 154 } // namespace content
154 155
155 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_ 156 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_
OLDNEW
« no previous file with comments | « trunk/src/content/browser/frame_host/frame_tree.cc ('k') | trunk/src/content/browser/frame_host/frame_tree_node.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698