cc: add more devtools instrumentation

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";
+const char kRequestMainThreadFrame[] = "RequestMainThreadFrame";
+const char kDrawFrame[] = "DrawFrame";
 }  // namespace internal
 
 const char kRasterTask[] = "RasterTask";
 const char kPaintSetup[] = "PaintSetup";
 
 class ScopedLayerTask {
  public:
   ScopedLayerTask(const char* event_name, int layer_id)
     : event_name_(event_name) {
     TRACE_EVENT_BEGIN1(internal::kCategory, event_name_,
@@ skipping 46 matching lines @@
       : 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) {
+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) {
+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);
 }
 
+inline void DidDrawFrame(int layer_tree_host_id) {
+  TRACE_EVENT_INSTANT1(internal::kCategory,
+                       internal::kDrawFrame,
+                       TRACE_EVENT_SCOPE_THREAD,
+                       internal::kLayerTreeId,
+                       layer_tree_host_id);
+}
+
+inline void DidRequestMainThreadFrame(int layer_tree_host_id) {
+  TRACE_EVENT_INSTANT1(internal::kCategory,
+                       internal::kRequestMainThreadFrame,
+                       TRACE_EVENT_SCOPE_THREAD,
+                       internal::kLayerTreeId,
+                       layer_tree_host_id);
+}
+
 }  // namespace devtools_instrumentation
 }  // namespace cc
 
 #endif  // CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_