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

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

Issue 1774853003: Revert of Trace FrameTreeNode Snapshots (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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"
11 #include "base/profiler/scoped_tracker.h" 11 #include "base/profiler/scoped_tracker.h"
12 #include "base/stl_util.h" 12 #include "base/stl_util.h"
13 #include "content/browser/frame_host/frame_tree.h" 13 #include "content/browser/frame_host/frame_tree.h"
14 #include "content/browser/frame_host/navigation_request.h" 14 #include "content/browser/frame_host/navigation_request.h"
15 #include "content/browser/frame_host/navigator.h" 15 #include "content/browser/frame_host/navigator.h"
16 #include "content/browser/frame_host/render_frame_host_impl.h" 16 #include "content/browser/frame_host/render_frame_host_impl.h"
17 #include "content/browser/frame_host/traced_frame_tree_node.h"
18 #include "content/browser/renderer_host/render_view_host_impl.h" 17 #include "content/browser/renderer_host/render_view_host_impl.h"
19 #include "content/common/frame_messages.h" 18 #include "content/common/frame_messages.h"
20 #include "content/common/site_isolation_policy.h" 19 #include "content/common/site_isolation_policy.h"
21 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
22 #include "content/public/common/browser_side_navigation_policy.h" 21 #include "content/public/common/browser_side_navigation_policy.h"
23 #include "third_party/WebKit/public/web/WebSandboxFlags.h" 22 #include "third_party/WebKit/public/web/WebSandboxFlags.h"
24 23
25 namespace content { 24 namespace content {
26 25
27 namespace { 26 namespace {
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 unique_name, 98 unique_name,
100 blink::WebSandboxFlags::None, 99 blink::WebSandboxFlags::None,
101 false /* should enforce strict mixed content checking */), 100 false /* should enforce strict mixed content checking */),
102 pending_sandbox_flags_(blink::WebSandboxFlags::None), 101 pending_sandbox_flags_(blink::WebSandboxFlags::None),
103 frame_owner_properties_(frame_owner_properties), 102 frame_owner_properties_(frame_owner_properties),
104 loading_progress_(kLoadingProgressNotStarted) { 103 loading_progress_(kLoadingProgressNotStarted) {
105 std::pair<FrameTreeNodeIdMap::iterator, bool> result = 104 std::pair<FrameTreeNodeIdMap::iterator, bool> result =
106 g_frame_tree_node_id_map.Get().insert( 105 g_frame_tree_node_id_map.Get().insert(
107 std::make_pair(frame_tree_node_id_, this)); 106 std::make_pair(frame_tree_node_id_, this));
108 CHECK(result.second); 107 CHECK(result.second);
109
110 TRACE_EVENT_OBJECT_CREATED_WITH_ID(
111 "navigation", "FrameTreeNode",
112 TRACE_ID_WITH_SCOPE("FrameTreeNode", frame_tree_node_id_));
113 TraceSnapshot();
114 base::trace_event::TraceLog::GetInstance()->AddEnabledStateObserver(this);
115 } 108 }
116 109
117 FrameTreeNode::~FrameTreeNode() { 110 FrameTreeNode::~FrameTreeNode() {
118 children_.clear(); 111 children_.clear();
119 frame_tree_->FrameRemoved(this); 112 frame_tree_->FrameRemoved(this);
120 FOR_EACH_OBSERVER(Observer, observers_, OnFrameTreeNodeDestroyed(this)); 113 FOR_EACH_OBSERVER(Observer, observers_, OnFrameTreeNodeDestroyed(this));
121 114
122 if (opener_) 115 if (opener_)
123 opener_->RemoveObserver(opener_observer_.get()); 116 opener_->RemoveObserver(opener_observer_.get());
124 117
125 g_frame_tree_node_id_map.Get().erase(frame_tree_node_id_); 118 g_frame_tree_node_id_map.Get().erase(frame_tree_node_id_);
126
127 TRACE_EVENT_OBJECT_DELETED_WITH_ID(
128 "navigation", "FrameTreeNode",
129 TRACE_ID_WITH_SCOPE("FrameTreeNode", frame_tree_node_id_));
130 base::trace_event::TraceLog::GetInstance()->RemoveEnabledStateObserver(this);
131 } 119 }
132 120
133 void FrameTreeNode::AddObserver(Observer* observer) { 121 void FrameTreeNode::AddObserver(Observer* observer) {
134 observers_.AddObserver(observer); 122 observers_.AddObserver(observer);
135 } 123 }
136 124
137 void FrameTreeNode::RemoveObserver(Observer* observer) { 125 void FrameTreeNode::RemoveObserver(Observer* observer) {
138 observers_.RemoveObserver(observer); 126 observers_.RemoveObserver(observer);
139 } 127 }
140 128
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 scoped_ptr<FrameTreeNode> node_to_delete(std::move(*iter)); 165 scoped_ptr<FrameTreeNode> node_to_delete(std::move(*iter));
178 children_.erase(iter); 166 children_.erase(iter);
179 node_to_delete.reset(); 167 node_to_delete.reset();
180 return; 168 return;
181 } 169 }
182 } 170 }
183 } 171 }
184 172
185 void FrameTreeNode::ResetForNewProcess() { 173 void FrameTreeNode::ResetForNewProcess() {
186 current_frame_host()->set_last_committed_url(GURL()); 174 current_frame_host()->set_last_committed_url(GURL());
187 TraceSnapshot();
188 175
189 // Remove child nodes from the tree, then delete them. This destruction 176 // Remove child nodes from the tree, then delete them. This destruction
190 // operation will notify observers. 177 // operation will notify observers.
191 std::vector<scoped_ptr<FrameTreeNode>>().swap(children_); 178 std::vector<scoped_ptr<FrameTreeNode>>().swap(children_);
192 } 179 }
193 180
194 void FrameTreeNode::SetOpener(FrameTreeNode* opener) { 181 void FrameTreeNode::SetOpener(FrameTreeNode* opener) {
195 if (opener_) { 182 if (opener_) {
196 opener_->RemoveObserver(opener_observer_.get()); 183 opener_->RemoveObserver(opener_observer_.get());
197 opener_observer_.reset(); 184 opener_observer_.reset();
198 } 185 }
199 186
200 opener_ = opener; 187 opener_ = opener;
201 188
202 if (opener_) { 189 if (opener_) {
203 if (!opener_observer_) 190 if (!opener_observer_)
204 opener_observer_ = make_scoped_ptr(new OpenerDestroyedObserver(this)); 191 opener_observer_ = make_scoped_ptr(new OpenerDestroyedObserver(this));
205 opener_->AddObserver(opener_observer_.get()); 192 opener_->AddObserver(opener_observer_.get());
206 } 193 }
207 } 194 }
208 195
209 void FrameTreeNode::SetCurrentURL(const GURL& url) { 196 void FrameTreeNode::SetCurrentURL(const GURL& url) {
210 if (!has_committed_real_load_ && url != GURL(url::kAboutBlankURL)) 197 if (!has_committed_real_load_ && url != GURL(url::kAboutBlankURL))
211 has_committed_real_load_ = true; 198 has_committed_real_load_ = true;
212 current_frame_host()->set_last_committed_url(url); 199 current_frame_host()->set_last_committed_url(url);
213 TraceSnapshot();
214 } 200 }
215 201
216 void FrameTreeNode::SetCurrentOrigin(const url::Origin& origin) { 202 void FrameTreeNode::SetCurrentOrigin(const url::Origin& origin) {
217 if (!origin.IsSameOriginWith(replication_state_.origin)) 203 if (!origin.IsSameOriginWith(replication_state_.origin))
218 render_manager_.OnDidUpdateOrigin(origin); 204 render_manager_.OnDidUpdateOrigin(origin);
219 replication_state_.origin = origin; 205 replication_state_.origin = origin;
220 } 206 }
221 207
222 void FrameTreeNode::SetFrameName(const std::string& name, 208 void FrameTreeNode::SetFrameName(const std::string& name,
223 const std::string& unique_name) { 209 const std::string& unique_name) {
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 if (speculative_frame_host) 441 if (speculative_frame_host)
456 speculative_frame_host->ResetLoadingState(); 442 speculative_frame_host->ResetLoadingState();
457 } else { 443 } else {
458 RenderFrameHostImpl* pending_frame_host = 444 RenderFrameHostImpl* pending_frame_host =
459 render_manager_.pending_frame_host(); 445 render_manager_.pending_frame_host();
460 if (pending_frame_host) 446 if (pending_frame_host)
461 pending_frame_host->ResetLoadingState(); 447 pending_frame_host->ResetLoadingState();
462 } 448 }
463 } 449 }
464 450
465 void FrameTreeNode::OnTraceLogEnabled() {
466 TraceSnapshot();
467 }
468
469 void FrameTreeNode::TraceSnapshot() const {
470 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(
471 "navigation", "FrameTreeNode",
472 TRACE_ID_WITH_SCOPE("FrameTreeNode", frame_tree_node_id_),
473 scoped_ptr<base::trace_event::ConvertableToTraceFormat>(
474 new TracedFrameTreeNode(*this)));
475 }
476
477 } // namespace content 451 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/frame_tree_node.h ('k') | content/browser/frame_host/traced_frame_tree_node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698