cc: add DevTools instrumentation for impl-side frames

cc/debug/devtools_instrumentation.h

 // Copyright 2013 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.
 
 #ifndef CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_
 #define CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_
 
 #include "base/debug/trace_event.h"
 
 namespace cc {
 namespace devtools_instrumentation {
 
 namespace internal {
 const char kCategory[] = "cc,devtools";
+const char kFrameId[] = "frameId";
 const char kLayerId[] = "layerId";
 const char kLayerTreeId[] = "layerTreeId";
 const char kPixelRefId[] = "pixelRefId";
 
 const char kImageDecodeTask[] = "ImageDecodeTask";
-}
+const char kBeginFrame[] = "BeginFrame";
+const char kActivateLayerTree[] = "ActivateLayerTree";
+}  // namespace internal
 
 const char kPaintLayer[] = "PaintLayer";
 const char kRasterTask[] = "RasterTask";
 const char kPaintSetup[] = "PaintSetup";
 const char kUpdateLayer[] = "UpdateLayer";
 
 class ScopedLayerTask {
  public:
   ScopedLayerTask(const char* event_name, int layer_id)
     : event_name_(event_name) {
@@ skipping 19 matching lines @@
     TRACE_EVENT_END0(internal::kCategory, internal::kImageDecodeTask);
   }
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedImageDecodeTask);
 };
 
 class ScopedLayerTreeTask {
  public:
   ScopedLayerTreeTask(const char* event_name,
                       int layer_id,
-                      uint64 tree_id)
+                      int layer_tree_host_id)
     : event_name_(event_name) {
     TRACE_EVENT_BEGIN2(internal::kCategory, event_name_,
-        internal::kLayerId, layer_id, internal::kLayerTreeId, tree_id);
+        internal::kLayerId, layer_id,
+        internal::kLayerTreeId, layer_tree_host_id);
   }
   ~ScopedLayerTreeTask() {
     TRACE_EVENT_END0(internal::kCategory, event_name_);
   }
  private:
   const char* event_name_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedLayerTreeTask);
 };
 
 struct ScopedLayerObjectTracker
     : public base::debug::TraceScopedTrackableObject<int> {
   explicit ScopedLayerObjectTracker(int layer_id)
       : base::debug::TraceScopedTrackableObject<int>(
             internal::kCategory,
             internal::kLayerId,
             layer_id) {
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedLayerObjectTracker);
 };
 
+inline void didActivateLayerTree(int layer_tree_host_id, int frame_id) {
+  TRACE_EVENT_INSTANT2(internal::kCategory,
+                       internal::kActivateLayerTree,
+                       TRACE_EVENT_SCOPE_THREAD,
+                       internal::kLayerTreeId, layer_tree_host_id,
+                       internal::kFrameId, frame_id);
+}
+
+inline void didBeginFrame(int layer_tree_host_id) {
+  TRACE_EVENT_INSTANT1(internal::kCategory,
+                       internal::kBeginFrame,
+                       TRACE_EVENT_SCOPE_THREAD,
+                       internal::kLayerTreeId, layer_tree_host_id);
+}
+
 }  // namespace devtools_instrumentation
 }  // namespace cc
 
 #endif  // CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_