Add/improve tracing in navigation.

content/browser/frame_host/render_frame_host_manager.cc

Index: content/browser/frame_host/render_frame_host_manager.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index 0468f581228542d5a92bb9b4acc0fc7e9aead0de..a037ad3aa2118bcc737c732babc332b4a070996a 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -188,7 +188,6 @@ void RenderFrameHostManager::SetPendingWebUI(const NavigationEntryImpl& entry) {
 
 RenderFrameHostImpl* RenderFrameHostManager::Navigate(
     const NavigationEntryImpl& entry) {
-  TRACE_EVENT0("browser", "RenderFrameHostManager:Navigate");

[Charlie Reis, 2014/08/27 22:05:13]

I think it's better to keep this one than UpdateStateForNavigate, since this
includes all of the latter.

[nasko, 2014/08/27 23:30:01]

Done.

   // Create a pending RenderFrameHost to use for the navigation.
   RenderFrameHostImpl* dest_render_frame_host = UpdateStateForNavigate(entry);
   if (!dest_render_frame_host)
@@ -498,6 +497,8 @@ void RenderFrameHostManager::RendererProcessClosing(
 
 void RenderFrameHostManager::SwapOutOldPage(
     RenderFrameHostImpl* old_render_frame_host) {
+  TRACE_EVENT1("navigation", "RenderFrameHostManager::SwapOutOldPage",
+               "FrameTreeNode id", frame_tree_node_->frame_tree_node_id());
   // Should only see this while we have a pending renderer.
   CHECK(cross_navigation_pending_);
 
@@ -1221,6 +1222,8 @@ int RenderFrameHostManager::GetRoutingIdForSiteInstance(
 }
 
 void RenderFrameHostManager::CommitPending() {
+  TRACE_EVENT1("navigation", "RenderFrameHostManager::CommitPending",
+               "FrameTreeNode id", frame_tree_node_->frame_tree_node_id());
   // First check whether we're going to want to focus the location bar after
   // this commit.  We do this now because the navigation hasn't formally
   // committed yet, so if we've already cleared |pending_web_ui_| the call chain
@@ -1419,6 +1422,9 @@ void RenderFrameHostManager::ShutdownRenderFrameProxyHostsInSiteInstance(
 
 RenderFrameHostImpl* RenderFrameHostManager::UpdateStateForNavigate(
     const NavigationEntryImpl& entry) {
+  TRACE_EVENT1("navigation",
+               "RenderFrameHostManager::UpdateStateForNavigate",
+               "FrameTreeNode id", frame_tree_node_->frame_tree_node_id());
   // If we are currently navigating cross-process, we want to get back to normal
   // and then navigate as usual.
   if (cross_navigation_pending_) {
@@ -1440,6 +1446,13 @@ RenderFrameHostImpl* RenderFrameHostManager::UpdateStateForNavigate(
       delegate_->GetLastCommittedNavigationEntryForRenderManager();
 
   if (new_instance.get() != current_instance) {
+    TRACE_EVENT_INSTANT2(
+        "navigation",
+        "RenderFrameHostManager::UpdateStateForNavigate:New SiteInstance",

[Charlie Reis, 2014/08/27 22:05:13]

Is this just so that we mark the cases that we have a cross-process navigation
in the trace?  Seems ok to me.

[nasko, 2014/08/27 23:30:01]

Yes. Also to log the new SiteInstance ID, in case we want to do correlation
later.

+        TRACE_EVENT_SCOPE_THREAD,
+        "current_instance id", current_instance->GetId(),
+        "new_instance id", new_instance->GetId());
+
     // New SiteInstance: create a pending RFH to navigate.
     DCHECK(!cross_navigation_pending_);
 
@@ -1553,6 +1566,8 @@ RenderFrameHostImpl* RenderFrameHostManager::UpdateStateForNavigate(
 }
 
 void RenderFrameHostManager::CancelPending() {
+  TRACE_EVENT1("navigation", "RenderFrameHostManager::CancelPending",
+               "FrameTreeNode id", frame_tree_node_->frame_tree_node_id());
   scoped_ptr<RenderFrameHostImpl> pending_render_frame_host =
       pending_render_frame_host_.Pass();