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

content/browser/renderer_host/render_widget_host_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/browser/renderer_host/render_widget_host_impl.h"
 
 #include <math.h>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 1655 matching lines @@
     DCHECK(!params.bitmap_rect.IsEmpty());
     gfx::Size pixel_size = gfx::ToFlooredSize(
         gfx::ScaleSize(params.bitmap_rect.size(), params.scale_factor));
     const size_t size = pixel_size.height() * pixel_size.width() * 4;
     if (dib->size() < size) {
       DLOG(WARNING) << "Transport DIB too small for given rectangle";
       RecordAction(UserMetricsAction("BadMessageTerminate_RWH1"));
       GetProcess()->ReceivedBadMessage();
     } else {
       UNSHIPPED_TRACE_EVENT_INSTANT2("test_latency", "UpdateRect",
+          TRACE_EVENT_SCOPE_THREAD,
           "x+y", params.bitmap_rect.x() + params.bitmap_rect.y(),
           "color", 0xffffff & *static_cast<uint32*>(dib->memory()));
       UNSHIPPED_TRACE_EVENT_INSTANT1("test_latency", "UpdateRectWidth",
+          TRACE_EVENT_SCOPE_THREAD,
           "width", params.bitmap_rect.width());
 
       // Scroll the backing store.
       if (!params.scroll_rect.IsEmpty()) {
         ScrollBackingStoreRect(params.scroll_delta,
                                params.scroll_rect,
                                params.view_size);
       }
 
       // Paint the backing store. This will update it with the
@@ skipping 92 matching lines @@
   // Measures the time from receiving the MsgUpdateRect IPC to completing the
   // DidUpdateBackingStore() method.  On platforms which have asynchronous
   // painting, such as Linux, this is the sum of MPArch.RWH_OnMsgUpdateRect,
   // MPArch.RWH_DidUpdateBackingStore, and the time spent asynchronously
   // waiting for the paint to complete.
   //
   // On other platforms, this will be equivalent to MPArch.RWH_OnMsgUpdateRect.
   delta = now - paint_start;
   UMA_HISTOGRAM_TIMES("MPArch.RWH_TotalPaintTime", delta);
   UNSHIPPED_TRACE_EVENT_INSTANT1("test_latency", "UpdateRectComplete",
+      TRACE_EVENT_SCOPE_THREAD,
       "x+y", params.bitmap_rect.x() + params.bitmap_rect.y());
 }
 
 void RenderWidgetHostImpl::OnInputEventAck(
     WebInputEvent::Type event_type, InputEventAckState ack_result) {
   TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::OnInputEventAck");
   bool processed = (ack_result == INPUT_EVENT_ACK_STATE_CONSUMED);
 
   if (!in_process_event_types_.empty() &&
       in_process_event_types_.front() == event_type)
@@ skipping 66 matching lines @@
     return;
   if (tick_active_smooth_scroll_gestures_task_posted_)
     return;
   TickActiveSmoothScrollGesture();
 }
 
 void RenderWidgetHostImpl::TickActiveSmoothScrollGesture() {
   TRACE_EVENT0("input", "RenderWidgetHostImpl::TickActiveSmoothScrollGesture");
   tick_active_smooth_scroll_gestures_task_posted_ = false;
   if (active_smooth_scroll_gestures_.empty()) {
-    TRACE_EVENT_INSTANT0("input", "EarlyOut_NoActiveScrollGesture");
+    TRACE_EVENT_INSTANT0("input", "EarlyOut_NoActiveScrollGesture",
+                         TRACE_EVENT_SCOPE_THREAD);
     return;
   }
 
   base::TimeTicks now = TimeTicks::HighResNow();
   base::TimeDelta preferred_interval =
       base::TimeDelta::FromMilliseconds(kSyntheticScrollMessageIntervalMs);
   base::TimeDelta time_until_next_ideal_interval =
       (last_smooth_scroll_gestures_tick_time_ + preferred_interval) -
       now;
   if (time_until_next_ideal_interval.InMilliseconds() > 0) {
     TRACE_EVENT_INSTANT1(
-        "input", "EarlyOut_TickedTooRecently",
+        "input", "EarlyOut_TickedTooRecently", TRACE_EVENT_SCOPE_THREAD,
         "delay", time_until_next_ideal_interval.InMilliseconds());
     // Post a task.
     tick_active_smooth_scroll_gestures_task_posted_ = true;
     MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&RenderWidgetHostImpl::TickActiveSmoothScrollGesture,
                    weak_factory_.GetWeakPtr()),
         time_until_next_ideal_interval);
     return;
   }
@@ skipping 20 matching lines @@
     DCHECK(it != active_smooth_scroll_gestures_.end());
     active_smooth_scroll_gestures_.erase(it);
 
     Send(new ViewMsg_SmoothScrollCompleted(routing_id_, id));
   }
 
   // No need to post the next tick if an input is in flight.
   if (!in_process_event_types_.empty())
     return;
 
-  TRACE_EVENT_INSTANT1("input", "PostTickTask",
+  TRACE_EVENT_INSTANT1("input", "PostTickTask", TRACE_EVENT_SCOPE_THREAD,
                        "delay", preferred_interval.InMilliseconds());
   tick_active_smooth_scroll_gestures_task_posted_ = true;
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&RenderWidgetHostImpl::TickActiveSmoothScrollGesture,
                  weak_factory_.GetWeakPtr()),
       preferred_interval);
 }
 
 void RenderWidgetHostImpl::OnSelectRangeAck() {
@@ skipping 523 matching lines @@
     return;
 
   OnRenderAutoResized(new_size);
 }
 
 void RenderWidgetHostImpl::DetachDelegate() {
   delegate_ = NULL;
 }
 
 }  // namespace content