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

content/renderer/render_widget.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_widget.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 1217 matching lines @@
       if (fractional_scale) {
         // Damage might not be DPI aligned.  Inflate rect to compensate.
         rect.Inset(-1, -1);
       }
       PaintRect(rect, pixel_bounds.origin(), canvas.get());
     }
 
     // Software FPS tick for performance tests. The accelerated path traces the
     // frame events in didCommitAndDrawCompositorFrame. See throughput_tests.cc.
     // NOTE: Tests may break if this event is renamed or moved.
-    UNSHIPPED_TRACE_EVENT_INSTANT0("test_fps", "TestFrameTickSW");
+    UNSHIPPED_TRACE_EVENT_INSTANT0("test_fps", "TestFrameTickSW",
+                                   TRACE_EVENT_SCOPE_THREAD);
   } else {  // Accelerated compositing path
     // Begin painting.
     // If painting is done via the gpu process then we don't set any damage
     // rects to save the browser process from doing unecessary work.
     pending_update_params_->bitmap_rect = bounds;
     pending_update_params_->scroll_rect = gfx::Rect();
     // We don't need an ack, because we're not sharing a DIB with the browser.
     // If it needs to (e.g. composited UI), the GPU process does its own ACK
     // with the browser for the GPU surface.
     pending_update_params_->needs_ack = false;
@@ skipping 220 matching lines @@
     Send(pending_input_event_ack_.release());
 }
 
 void RenderWidget::DidCommitCompositorFrame() {
 }
 
 void RenderWidget::didCommitAndDrawCompositorFrame() {
   TRACE_EVENT0("gpu", "RenderWidget::didCommitAndDrawCompositorFrame");
   // Accelerated FPS tick for performance tests. See throughput_tests.cc.
   // NOTE: Tests may break if this event is renamed or moved.
-  UNSHIPPED_TRACE_EVENT_INSTANT0("test_fps", "TestFrameTickGPU");
+  UNSHIPPED_TRACE_EVENT_INSTANT0("test_fps", "TestFrameTickGPU",
+                                 TRACE_EVENT_SCOPE_THREAD);
   // Notify subclasses that we initiated the paint operation.
   DidInitiatePaint();
 }
 
 void RenderWidget::didCompleteSwapBuffers() {
   TRACE_EVENT0("renderer", "RenderWidget::didCompleteSwapBuffers");
 
   // Notify subclasses threaded composited rendering was flushed to the screen.
   DidFlushPaint();
 
@@ skipping 818 matching lines @@
 
   if (!context->Initialize(
           attributes,
           false /* bind generates resources */,
           CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE))
     return NULL;
   return context.release();
 }
 
 }  // namespace content