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

cc/thread_proxy.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/thread_proxy.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "cc/delay_based_time_source.h"
@@ skipping 742 matching lines @@
     m_layerTreeHost->beginCommitOnImplThread(m_layerTreeHostImpl.get());
     m_layerTreeHost->finishCommitOnImplThread(m_layerTreeHostImpl.get());
     m_layerTreeHostImpl->commitComplete();
 
     m_nextFrameIsNewlyCommittedFrameOnImplThread = true;
 
     if (m_layerTreeHost->settings().implSidePainting && m_layerTreeHost->blocksPendingCommit())
     {
         // For some layer types in impl-side painting, the commit is held until
         // the pending tree is activated.
-        TRACE_EVENT_INSTANT0("cc", "HoldCommit");
+        TRACE_EVENT_INSTANT0("cc", "HoldCommit", TRACE_EVENT_SCOPE_THREAD);
         m_completionEventForCommitHeldOnTreeActivation = m_commitCompletionEventOnImplThread;
         m_commitCompletionEventOnImplThread = 0;
     }
     else
     {
         m_commitCompletionEventOnImplThread->signal();
         m_commitCompletionEventOnImplThread = 0;
     }
 
     // SetVisible kicks off the next scheduler action, so this must be last.
@@ skipping 61 matching lines @@
     bool drawFrame = m_layerTreeHostImpl->canDraw() && (m_layerTreeHostImpl->prepareToDraw(frame) || forcedDraw);
     if (drawFrame) {
         m_layerTreeHostImpl->drawLayers(frame);
         result.didDraw = true;
     }
     m_layerTreeHostImpl->didDrawAllLayers(frame);
 
     // Check for tree activation.
     if (m_completionEventForCommitHeldOnTreeActivation && !m_layerTreeHostImpl->pendingTree())
     {
-        TRACE_EVENT_INSTANT0("cc", "ReleaseCommitbyActivation");
+        TRACE_EVENT_INSTANT0("cc", "ReleaseCommitbyActivation",
+                             TRACE_EVENT_SCOPE_THREAD);
         DCHECK(m_layerTreeHostImpl->settings().implSidePainting);
         m_completionEventForCommitHeldOnTreeActivation->signal();
         m_completionEventForCommitHeldOnTreeActivation = 0;
     }
 
     // Check for a pending compositeAndReadback.
     if (m_readbackRequestOnImplThread) {
         m_readbackRequestOnImplThread->success = false;
         if (drawFrame) {
             m_layerTreeHostImpl->readback(m_readbackRequestOnImplThread->pixels, m_readbackRequestOnImplThread->rect);
@@ skipping 356 matching lines @@
 
 void ThreadProxy::renewTreePriorityOnImplThread()
 {
     DCHECK(m_renewTreePriorityOnImplThreadPending);
     m_renewTreePriorityOnImplThreadPending = false;
 
     renewTreePriority();
 }
 
 }  // namespace cc