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

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

Issue 1635873003: Replicating WebFrame::uniqueName across renderers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dump-render-tree3
Patch Set: Fixing fallout from the new assert in FrameTree.cpp. Created 4 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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 NodeRange Nodes(); 110 NodeRange Nodes();
111 111
112 // Adds a new child frame to the frame tree. |process_id| is required to 112 // Adds a new child frame to the frame tree. |process_id| is required to
113 // disambiguate |new_routing_id|, and it must match the process of the 113 // disambiguate |new_routing_id|, and it must match the process of the
114 // |parent| node. Otherwise no child is added and this method returns false. 114 // |parent| node. Otherwise no child is added and this method returns false.
115 bool AddFrame(FrameTreeNode* parent, 115 bool AddFrame(FrameTreeNode* parent,
116 int process_id, 116 int process_id,
117 int new_routing_id, 117 int new_routing_id,
118 blink::WebTreeScopeType scope, 118 blink::WebTreeScopeType scope,
119 const std::string& frame_name, 119 const std::string& frame_name,
120 const std::string& frame_unique_name,
120 blink::WebSandboxFlags sandbox_flags, 121 blink::WebSandboxFlags sandbox_flags,
121 const blink::WebFrameOwnerProperties& frame_owner_properties); 122 const blink::WebFrameOwnerProperties& frame_owner_properties);
122 123
123 // Removes a frame from the frame tree. |child|, its children, and objects 124 // Removes a frame from the frame tree. |child|, its children, and objects
124 // owned by their RenderFrameHostManagers are immediately deleted. The root 125 // owned by their RenderFrameHostManagers are immediately deleted. The root
125 // node cannot be removed this way. 126 // node cannot be removed this way.
126 void RemoveFrame(FrameTreeNode* child); 127 void RemoveFrame(FrameTreeNode* child);
127 128
128 // This method walks the entire frame tree and creates a RenderFrameProxyHost 129 // This method walks the entire frame tree and creates a RenderFrameProxyHost
129 // for the given |site_instance| in each node except the |source| one -- 130 // for the given |site_instance| in each node except the |source| one --
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 247
247 // Overall load progress. 248 // Overall load progress.
248 double load_progress_; 249 double load_progress_;
249 250
250 DISALLOW_COPY_AND_ASSIGN(FrameTree); 251 DISALLOW_COPY_AND_ASSIGN(FrameTree);
251 }; 252 };
252 253
253 } // namespace content 254 } // namespace content
254 255
255 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_H_ 256 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698