Add a |scope| argument to TRACE_EVENT_INSTANT* and require its presence.

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 3706 matching lines @@
       &error_description);
   Send(new ViewHostMsg_DidFailLoadWithError(routing_id_,
                                             frame->identifier(),
                                             failed_request.url(),
                                             !frame->parent(),
                                             error.reason,
                                             error_description));
 }
 
 void RenderViewImpl::didFinishLoad(WebFrame* frame) {
+  if (!frame->parent())
+    TRACE_EVENT_INSTANT0("WebCore", "LoadEvent", TRACE_EVENT_SCOPE_THREAD);
   WebDataSource* ds = frame->dataSource();
   DocumentState* document_state = DocumentState::FromDataSource(ds);
   if (document_state->finish_load_time().is_null())
     document_state->set_finish_load_time(Time::Now());
 
   FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidFinishLoad(frame));
 
   Send(new ViewHostMsg_DidFinishLoad(routing_id_,
                                      frame->identifier(),
                                      ds->request().url(),
@@ skipping 1458 matching lines @@
     frame = frame->findChildByExpression(*i);
   }
 
   return frame;
 }
 
 void RenderViewImpl::OnScriptEvalRequest(const string16& frame_xpath,
                                          const string16& jscript,
                                          int id,
                                          bool notify_result) {
-  TRACE_EVENT_INSTANT0("test_tracing", "OnScriptEvalRequest");
+  TRACE_EVENT_INSTANT0("test_tracing", "OnScriptEvalRequest",
+                       TRACE_EVENT_SCOPE_THREAD);
   EvaluateScript(frame_xpath, jscript, id, notify_result);
 }
 
 void RenderViewImpl::OnPostMessageEvent(
     const ViewMsg_PostMessage_Params& params) {
   // Find the target frame of this message. The source tags the message with
   // |target_frame_id|, so use it to locate the frame.
   // TODO(nasko): Lookup based on the frame id, once http://crbug.com/153701
   // is fixed and we can rely on having frame tree updates again.
   WebFrame* frame = webview()->mainFrame();
@@ skipping 1446 matching lines @@
   TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle);
   RenderProcess::current()->ReleaseTransportDIB(dib);
 }
 
 void RenderViewImpl::DidCommitCompositorFrame() {
   RenderWidget::DidCommitCompositorFrame();
   FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame());
 }
 
 }  // namespace content