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

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

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