1 files changed, 32 insertions, 8 deletions
diff --git a/chromium/cc/debug/devtools_instrumentation.h b/chromium/cc/debug/devtools_instrumentation.h
index 3caa81ea6d5..85a9850f20b 100644
--- a/chromium/cc/debug/devtools_instrumentation.h
+++ b/chromium/cc/debug/devtools_instrumentation.h
@@ -11,7 +11,9 @@ namespace cc {
 namespace devtools_instrumentation {
 
 namespace internal {
-const char kCategory[] = "cc,devtools";
+const char kCategory[] = TRACE_DISABLED_BY_DEFAULT("devtools.timeline");
+const char kCategoryFrame[] =
+    TRACE_DISABLED_BY_DEFAULT("devtools.timeline.frame");
 const char kFrameId[] = "frameId";
 const char kLayerId[] = "layerId";
 const char kLayerTreeId[] = "layerTreeId";
@@ -20,10 +22,13 @@ 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";
+const char kUpdateLayer[] = "UpdateLayer";
 
 class ScopedLayerTask {
  public:
@@ -86,19 +91,38 @@ struct ScopedLayerObjectTracker
   DISALLOW_COPY_AND_ASSIGN(ScopedLayerObjectTracker);
 };
 
-inline void didActivateLayerTree(int layer_tree_host_id, int frame_id) {
-  TRACE_EVENT_INSTANT2(internal::kCategory,
+inline void DidActivateLayerTree(int layer_tree_host_id, int frame_id) {
+  TRACE_EVENT_INSTANT2(internal::kCategoryFrame,
                        internal::kActivateLayerTree,
                        TRACE_EVENT_SCOPE_THREAD,
-                       internal::kLayerTreeId, layer_tree_host_id,
-                       internal::kFrameId, frame_id);
+                       internal::kLayerTreeId,
+                       layer_tree_host_id,
+                       internal::kFrameId,
+                       frame_id);
 }
 
-inline void didBeginFrame(int layer_tree_host_id) {
-  TRACE_EVENT_INSTANT1(internal::kCategory,
+inline void DidBeginFrame(int layer_tree_host_id) {
+  TRACE_EVENT_INSTANT1(internal::kCategoryFrame,
                        internal::kBeginFrame,
                        TRACE_EVENT_SCOPE_THREAD,
-                       internal::kLayerTreeId, layer_tree_host_id);
+                       internal::kLayerTreeId,
+                       layer_tree_host_id);
+}
+
+inline void DidDrawFrame(int layer_tree_host_id) {
+  TRACE_EVENT_INSTANT1(internal::kCategoryFrame,
+                       internal::kDrawFrame,
+                       TRACE_EVENT_SCOPE_THREAD,
+                       internal::kLayerTreeId,
+                       layer_tree_host_id);
+}
+
+inline void DidRequestMainThreadFrame(int layer_tree_host_id) {
+  TRACE_EVENT_INSTANT1(internal::kCategoryFrame,
+                       internal::kRequestMainThreadFrame,
+                       TRACE_EVENT_SCOPE_THREAD,
+                       internal::kLayerTreeId,
+                       layer_tree_host_id);
 }
 
 }  // namespace devtools_instrumentation