Chromium Code Reviews| Index: content/browser/frame_host/frame_tree_node.cc |
| diff --git a/content/browser/frame_host/frame_tree_node.cc b/content/browser/frame_host/frame_tree_node.cc |
| index f9b793fb35a6029e20962ba2b6c8b00449097fd9..509589031099515c5a38987d7e7c2bad223e3883 100644 |
| --- a/content/browser/frame_host/frame_tree_node.cc |
| +++ b/content/browser/frame_host/frame_tree_node.cc |
| @@ -14,6 +14,7 @@ |
| #include "content/browser/frame_host/navigation_request.h" |
| #include "content/browser/frame_host/navigator.h" |
| #include "content/browser/frame_host/render_frame_host_impl.h" |
| +#include "content/browser/frame_host/traced_frame_tree_node.h" |
| #include "content/browser/renderer_host/render_view_host_impl.h" |
| #include "content/common/frame_messages.h" |
| #include "content/common/site_isolation_policy.h" |
| @@ -105,6 +106,16 @@ FrameTreeNode::FrameTreeNode( |
| g_frame_tree_node_id_map.Get().insert( |
| std::make_pair(frame_tree_node_id_, this)); |
| CHECK(result.second); |
| + |
| + TRACE_EVENT_OBJECT_CREATED_WITH_ID( |
| + "navigation", "FrameTreeNode", |
| + TRACE_ID_WITH_SCOPE("FrameTreeNode", frame_tree_node_id_)); |
| + TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID( |
| + "navigation", "FrameTreeNode", |
| + TRACE_ID_WITH_SCOPE("FrameTreeNode", frame_tree_node_id_), |
| + scoped_ptr<base::trace_event::ConvertableToTraceFormat>( |
| + new TracedFrameTreeNode(*this))); |
| + base::trace_event::TraceLog::GetInstance()->AddEnabledStateObserver(this); |
| } |
| FrameTreeNode::~FrameTreeNode() { |
| @@ -116,6 +127,11 @@ FrameTreeNode::~FrameTreeNode() { |
| opener_->RemoveObserver(opener_observer_.get()); |
| g_frame_tree_node_id_map.Get().erase(frame_tree_node_id_); |
| + |
| + TRACE_EVENT_OBJECT_DELETED_WITH_ID( |
| + "navigation", "FrameTreeNode", |
| + TRACE_ID_WITH_SCOPE("FrameTreeNode", frame_tree_node_id_)); |
| + base::trace_event::TraceLog::GetInstance()->RemoveEnabledStateObserver(this); |
| } |
| void FrameTreeNode::AddObserver(Observer* observer) { |
| @@ -173,6 +189,12 @@ void FrameTreeNode::RemoveChild(FrameTreeNode* child) { |
| void FrameTreeNode::ResetForNewProcess() { |
| current_frame_host()->set_last_committed_url(GURL()); |
| + TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID( |
|
Sami
2016/03/02 00:29:01
Should we move this to a helper method to avoid re
benjhayden
2016/03/02 18:53:03
Done.
|
| + "navigation", "FrameTreeNode", |
| + TRACE_ID_WITH_SCOPE("FrameTreeNode", frame_tree_node_id_), |
| + scoped_ptr<base::trace_event::ConvertableToTraceFormat>( |
| + new TracedFrameTreeNode(*this))); |
| + |
| // Remove child nodes from the tree, then delete them. This destruction |
| // operation will notify observers. |
| std::vector<scoped_ptr<FrameTreeNode>>().swap(children_); |
| @@ -197,6 +219,12 @@ void FrameTreeNode::SetCurrentURL(const GURL& url) { |
| if (!has_committed_real_load_ && url != GURL(url::kAboutBlankURL)) |
| has_committed_real_load_ = true; |
| current_frame_host()->set_last_committed_url(url); |
| + |
| + TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID( |
| + "navigation", "FrameTreeNode", |
| + TRACE_ID_WITH_SCOPE("FrameTreeNode", frame_tree_node_id_), |
| + scoped_ptr<base::trace_event::ConvertableToTraceFormat>( |
| + new TracedFrameTreeNode(*this))); |
| } |
| void FrameTreeNode::SetCurrentOrigin(const url::Origin& origin) { |
| @@ -448,4 +476,12 @@ void FrameTreeNode::BeforeUnloadCanceled() { |
| } |
| } |
| +void FrameTreeNode::OnTraceLogEnabled() { |
| + TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID( |
| + "navigation", "FrameTreeNode", |
| + TRACE_ID_WITH_SCOPE("FrameTreeNode", frame_tree_node_id_), |
| + scoped_ptr<base::trace_event::ConvertableToTraceFormat>( |
| + new TracedFrameTreeNode(*this))); |
| +} |
| + |
| } // namespace content |