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

cc/layer_tree_host_impl.cc

 // Copyright 2011 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 "cc/layer_tree_host_impl.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
@@ skipping 209 matching lines @@
     m_client->sendManagedMemoryStats();
 }
 
 bool LayerTreeHostImpl::canDraw()
 {
     // Note: If you are changing this function or any other function that might
     // affect the result of canDraw, make sure to call m_client->onCanDrawStateChanged
     // in the proper places and update the notifyIfCanDrawChanged test.
 
     if (!rootLayer()) {
-        TRACE_EVENT_INSTANT0("cc", "LayerTreeHostImpl::canDraw no root layer");
+        TRACE_EVENT_INSTANT0("cc", "LayerTreeHostImpl::canDraw no root layer",
+                             TRACE_EVENT_SCOPE_THREAD);
         return false;
     }
     if (deviceViewportSize().IsEmpty()) {
-        TRACE_EVENT_INSTANT0("cc", "LayerTreeHostImpl::canDraw empty viewport");
+        TRACE_EVENT_INSTANT0("cc", "LayerTreeHostImpl::canDraw empty viewport",
+                             TRACE_EVENT_SCOPE_THREAD);
         return false;
     }
     if (m_activeTree->ViewportSizeInvalid()) {
-        TRACE_EVENT_INSTANT0("cc", "LayerTreeHostImpl::canDraw viewport size recently changed");
+        TRACE_EVENT_INSTANT0("cc", "LayerTreeHostImpl::canDraw viewport size recently changed",
+                             TRACE_EVENT_SCOPE_THREAD);
         return false;
     }
     if (!m_renderer) {
-        TRACE_EVENT_INSTANT0("cc", "LayerTreeHostImpl::canDraw no renderer");
+        TRACE_EVENT_INSTANT0("cc", "LayerTreeHostImpl::canDraw no renderer",
+                             TRACE_EVENT_SCOPE_THREAD);
         return false;
     }
     if (m_activeTree->ContentsTexturesPurged()) {
-        TRACE_EVENT_INSTANT0("cc", "LayerTreeHostImpl::canDraw contents textures purged");
+        TRACE_EVENT_INSTANT0("cc", "LayerTreeHostImpl::canDraw contents textures purged",
+                             TRACE_EVENT_SCOPE_THREAD);
         return false;
     }
     return true;
 }
 
 OutputSurface* LayerTreeHostImpl::outputSurface() const
 {
     return m_outputSurface.get();
 }
 
@@ skipping 553 matching lines @@
 
     if (m_tileManager) {
         m_memoryHistory->SaveEntry(
             m_tileManager->memory_stats_from_last_assign());
     }
 
     if (m_debugState.showHudRects())
         m_debugRectHistory->saveDebugRectsForCurrentFrame(rootLayer(), *frame.renderSurfaceLayerList, frame.occludingScreenSpaceRects, frame.nonOccludingScreenSpaceRects, m_debugState);
 
     if (m_debugState.traceAllRenderedFrames) {
-        TRACE_EVENT_INSTANT1("cc.debug", "Frame",
+        TRACE_EVENT_INSTANT1("cc.debug", "Frame", TRACE_EVENT_SCOPE_THREAD,
                              "frame", ValueToString(frameStateAsValue()));
     }
 
     // Because the contents of the HUD depend on everything else in the frame, the contents
     // of its texture are updated as the last thing before the frame is drawn.
     if (m_activeTree->hud_layer())
         m_activeTree->hud_layer()->updateHudTexture(m_resourceProvider.get());
 
     m_renderer->drawFrame(frame.renderPasses);
     // The render passes should be consumed by the renderer.
@@ skipping 960 matching lines @@
         m_tileManager->SetRecordRenderingStats(m_debugState.recordRenderingStats());
 }
 
 void LayerTreeHostImpl::savePaintTime(const base::TimeDelta& totalPaintTime, int commitNumber)
 {
     DCHECK(m_debugState.continuousPainting);
     m_paintTimeCounter->SavePaintTime(totalPaintTime, commitNumber);
 }
 
 }  // namespace cc