Fix devtools.timeline DOM GC slices

DOM GC slices in devtools performance pane broke when we renamed the events.
This CL
- reenables DOM GC slices
- reduce DOM GC to only the atomic phase, in line with V8 GC
- enable IncrementalMarking* slices by default

Bug: None
Change-Id: Ib5261ab6069d017b65b78de72315e95cc242b9d3
Reviewed-on: https://chromium-review.googlesource.com/1154863
Commit-Queue: Keishi Hattori <keishi@chromium.org>
Reviewed-by: Alexei Filippov <alph@chromium.org>
Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582144}

third_party/WebKit/LayoutTests/http/tests/devtools/tracing/timeline-misc/timeline-dom-gc-expected.txt

+Tests the Timeline API instrumentation of a DOM GC event
+
+SUCCESS: Found expected Blink GC event record
+

third_party/WebKit/LayoutTests/http/tests/devtools/tracing/timeline-misc/timeline-dom-gc.js

+// Copyright 2018 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.
+
+(async function() {
+  TestRunner.addResult(
+      `Tests the Timeline API instrumentation of a DOM GC event\n`);
+  await TestRunner.loadModule('performance_test_runner');
+  await TestRunner.showPanel('timeline');
+  await TestRunner.evaluateInPagePromise(`
+        function produceGarbageForGCEvents()
+        {
+            window.gc();
+            return new Promise(fulfill => testRunner.layoutAndPaintAsyncThen(fulfill));
+        }
+    `);
+
+  await PerformanceTestRunner.invokeAsyncWithTimeline(
+      'produceGarbageForGCEvents');
+
+  const gcEvent = PerformanceTestRunner.findTimelineEvent(
+      TimelineModel.TimelineModel.RecordType.GCCollectGarbage);
+  if (gcEvent)
+    TestRunner.addResult('SUCCESS: Found expected Blink GC event record');
+  else
+    TestRunner.addResult(`FAIL: Blink GC event record wasn't found`);
+  TestRunner.completeTest();
+})();

third_party/blink/renderer/devtools/front_end/timeline/TimelineUIUtils.js

@@ -179,10 +179,6 @@ Timeline.TimelineUIUtils = class {
     eventStyles[recordTypes.LatencyInfo] =
         new Timeline.TimelineRecordStyle(Common.UIString('Input Latency'), categories['scripting']);
 
-    eventStyles[recordTypes.GCIdleLazySweep] =
-        new Timeline.TimelineRecordStyle(Common.UIString('DOM GC'), categories['scripting']);
-    eventStyles[recordTypes.GCCompleteSweep] =
-        new Timeline.TimelineRecordStyle(Common.UIString('DOM GC'), categories['scripting']);
     eventStyles[recordTypes.GCCollectGarbage] =
         new Timeline.TimelineRecordStyle(Common.UIString('DOM GC'), categories['scripting']);
 
@@ -604,18 +600,6 @@ Timeline.TimelineUIUtils = class {
         detailsText = eventData && eventData['name'];
         break;
 
-      case recordType.GCIdleLazySweep:
-        detailsText = Common.UIString('idle sweep');
-        break;
-
-      case recordType.GCCompleteSweep:
-        detailsText = Common.UIString('complete sweep');
-        break;
-
-      case recordType.GCCollectGarbage:
-        detailsText = Common.UIString('collect');
-        break;
-
       case recordType.AsyncTask:
         detailsText = eventData ? eventData['name'] : null;
         break;
@@ -688,9 +672,6 @@ Timeline.TimelineUIUtils = class {
       case recordType.WebSocketSendHandshakeRequest:
       case recordType.WebSocketReceiveHandshakeResponse:
       case recordType.WebSocketDestroy:
-      case recordType.GCIdleLazySweep:
-      case recordType.GCCompleteSweep:
-      case recordType.GCCollectGarbage:
         detailsText = Timeline.TimelineUIUtils.buildDetailsTextForTraceEvent(event, target);
         break;
       case recordType.PaintImage:

third_party/blink/renderer/devtools/front_end/timeline_model/TimelineModel.js

@@ -1275,9 +1275,7 @@ TimelineModel.TimelineModel.RecordType = {
   InputLatencyMouseMove: 'InputLatency::MouseMove',
   InputLatencyMouseWheel: 'InputLatency::MouseWheel',
   ImplSideFling: 'InputHandlerProxy::HandleGestureFling::started',
-  GCIdleLazySweep: 'ThreadState::performIdleLazySweep',
-  GCCompleteSweep: 'ThreadState::completeSweep',
-  GCCollectGarbage: 'BlinkGCMarking',
+  GCCollectGarbage: 'BlinkGC.AtomicPhase',
 
   CryptoDoEncrypt: 'DoEncrypt',
   CryptoDoEncryptReply: 'DoEncryptReply',

third_party/blink/renderer/platform/heap/heap_stats_collector.h

@@ -99,14 +99,11 @@ class PLATFORM_EXPORT ThreadHeapStatsCollector {
 
   static constexpr int kNumScopeIds = kLastScopeId + 1;
 
-  enum TraceDefaultBehavior {
-    kEnabled,
-    kDisabled,
-  };
+  enum TraceCategory { kEnabled, kDisabled, kDevTools };
 
   // Trace a particular scope. Will emit a trace event and record the time in
   // the corresponding ThreadHeapStatsCollector.
-  template <TraceDefaultBehavior default_behavior = kDisabled>
+  template <TraceCategory trace_category = kDisabled>
   class PLATFORM_EXPORT InternalScope {
     DISALLOW_NEW();
     DISALLOW_COPY_AND_ASSIGN(InternalScope);
@@ -125,9 +122,14 @@ class PLATFORM_EXPORT ThreadHeapStatsCollector {
 
    private:
     constexpr static const char* TraceCategory() {
-      return default_behavior == kEnabled
-                 ? "blink_gc"
-                 : TRACE_DISABLED_BY_DEFAULT("blink_gc");
+      switch (trace_category) {
+        case kEnabled:
+          return "blink_gc";
+        case kDisabled:
+          return TRACE_DISABLED_BY_DEFAULT("blink_gc");
+        case kDevTools:
+          return "blink_gc,devtools.timeline";
+      }
     }
 
     void StartTrace() { TRACE_EVENT_BEGIN0(TraceCategory(), ToString(id_)); }
@@ -149,6 +151,7 @@ class PLATFORM_EXPORT ThreadHeapStatsCollector {
 
   using Scope = InternalScope<kDisabled>;
   using EnabledScope = InternalScope<kEnabled>;
+  using DevToolsScope = InternalScope<kDevTools>;
 
   // POD to hold interesting data accumulated during a garbage collection cycle.
   // The event is always fully polulated when looking at previous events but

third_party/blink/renderer/platform/heap/thread_state.cc

@@ -1453,7 +1453,7 @@ void ThreadState::IncrementalMarkingStart(BlinkGC::GCReason reason) {
   CompleteSweep();
   Heap().stats_collector()->NotifyMarkingStarted(reason);
   {
-    ThreadHeapStatsCollector::Scope stats_scope(
+    ThreadHeapStatsCollector::EnabledScope stats_scope(
         Heap().stats_collector(),
         ThreadHeapStatsCollector::kIncrementalMarkingStartMarking, "reason",
         GcReasonString(reason));
@@ -1471,7 +1471,7 @@ void ThreadState::IncrementalMarkingStart(BlinkGC::GCReason reason) {
 }
 
 void ThreadState::IncrementalMarkingStep() {
-  ThreadHeapStatsCollector::Scope stats_scope(
+  ThreadHeapStatsCollector::EnabledScope stats_scope(
       Heap().stats_collector(),
       ThreadHeapStatsCollector::kIncrementalMarkingStep);
   VLOG(2) << "[state:" << this << "] "
@@ -1488,7 +1488,7 @@ void ThreadState::IncrementalMarkingStep() {
 }
 
 void ThreadState::IncrementalMarkingFinalize() {
-  ThreadHeapStatsCollector::Scope stats_scope(
+  ThreadHeapStatsCollector::EnabledScope stats_scope(
       Heap().stats_collector(),
       ThreadHeapStatsCollector::kIncrementalMarkingFinalize);
   VLOG(2) << "[state:" << this << "] "
@@ -1577,7 +1577,7 @@ void ThreadState::RunAtomicPause(BlinkGC::StackState stack_state,
                                  BlinkGC::SweepingType sweeping_type,
                                  BlinkGC::GCReason reason) {
   {
-    ThreadHeapStatsCollector::EnabledScope stats1(
+    ThreadHeapStatsCollector::DevToolsScope stats1(
         Heap().stats_collector(), ThreadHeapStatsCollector::kAtomicPhase);
     AtomicPauseScope atomic_pause_scope(this);
     {