DevTools: Move page metric events on performance panel out of experiment.

BUG=901165

Change-Id: I1788e537ed29bab14558d12372bda59f2bfa8698
Reviewed-on: https://chromium-review.googlesource.com/c/1352850Reviewed-by: Paul Irish <paulirish@chromium.org>
Commit-Queue: Alexei Filippov <alph@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612505}

third_party/blink/renderer/devtools/front_end/main/Main.js

@@ -129,7 +129,6 @@ Main.Main = class {
     Runtime.experiments.register('timelineEventInitiators', 'Timeline: event initiators');
     Runtime.experiments.register('timelineFlowEvents', 'Timeline: flow events', true);
     Runtime.experiments.register('timelineInvalidationTracking', 'Timeline: invalidation tracking', true);
-    Runtime.experiments.register('timelinePaintTimingMarkers', 'Timeline: paint timing markers', true);
     Runtime.experiments.register('timelineShowAllEvents', 'Timeline: show all events', true);
     Runtime.experiments.register('timelineTracingJSProfile', 'Timeline: tracing based JS profiler', true);
     Runtime.experiments.register('timelineV8RuntimeCallStats', 'Timeline: V8 Runtime Call Stats on Timeline', true);

third_party/blink/renderer/devtools/front_end/perf_ui/FlameChart.js

@@ -345,18 +345,7 @@ PerfUI.FlameChart = class extends UI.VBox {
   }
 
   _updateHighlight() {
-    let entryIndex;
-    if (!Runtime.experiments.isEnabled('timelinePaintTimingMarkers')) {
-      const inDividersBar = this._lastMouseOffsetY < PerfUI.FlameChart.HeaderHeight;
-      this._highlightedMarkerIndex = inDividersBar ? this._markerIndexAtPosition(this._lastMouseOffsetX) : -1;
-      this._updateMarkerHighlight();
-
-      entryIndex = this._highlightedMarkerIndex === -1 ?
-          this._coordinatesToEntryIndex(this._lastMouseOffsetX, this._lastMouseOffsetY) :
-          -1;
-    } else {
-      entryIndex = this._coordinatesToEntryIndex(this._lastMouseOffsetX, this._lastMouseOffsetY);
-    }
+    const entryIndex = this._coordinatesToEntryIndex(this._lastMouseOffsetX, this._lastMouseOffsetY);
     if (entryIndex === -1) {
       this.hideHighlight();
       const group =

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

@@ -406,10 +406,9 @@ Timeline.TimelineFlameChartDataProvider = class extends Common.Object {
       group = this._appendHeader(title, style, selectable);
       group._track = track;
     }
-    const markerEventsFilter = Timeline.TimelineUIUtils.paintEventsFilter();
     for (let i = 0; i < events.length; ++i) {
       const e = events[i];
-      if (!isExtension && this._performanceModel.timelineModel().isMarkerEvent(e) && markerEventsFilter.accept(e)) {
+      if (!isExtension && this._performanceModel.timelineModel().isMarkerEvent(e)) {
         this._markers.push(new Timeline.TimelineFlameChartMarker(
             e.startTime, e.startTime - this._model.minimumRecordTime(),
             Timeline.TimelineUIUtils.markerStyleForEvent(e)));
@@ -528,16 +527,13 @@ Timeline.TimelineFlameChartDataProvider = class extends Common.Object {
   }
 
   _appendPageMetrics() {
-    if (!Runtime.experiments.isEnabled('timelinePaintTimingMarkers'))
-      return;
     this._entryTypeByLevel[this._currentLevel] = Timeline.TimelineFlameChartDataProvider.EntryType.Event;
 
-    const metricsEventFilter = Timeline.TimelineUIUtils.paintEventsFilter();
     /** @type {!Array<!SDK.TracingModel.Event>} */
     const metricEvents = [];
     for (const track of this._model.tracks()) {
       for (const event of track.events) {
-        if (!this._performanceModel.timelineModel().isMarkerEvent(event) || !metricsEventFilter.accept(event))
+        if (!this._performanceModel.timelineModel().isMarkerEvent(event))
           continue;
         metricEvents.push(event);
       }

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

@@ -484,17 +484,8 @@ Timeline.TimelineFlameChartMarker = class {
 
     if (this._style.lowPriority && pixelsPerMillisecond < lowPriorityVisibilityThresholdInPixelsPerMs)
       return;
-    context.save();
-
-    if (!this._style.lowPriority && !Runtime.experiments.isEnabled('timelinePaintTimingMarkers')) {
-      context.strokeStyle = this._style.color;
-      context.lineWidth = 2;
-      context.beginPath();
-      context.moveTo(x, 0);
-      context.lineTo(x, height);
-      context.stroke();
-    }
 
+    context.save();
     if (this._style.tall) {
       context.strokeStyle = this._style.color;
       context.lineWidth = this._style.lineWidth;

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

@@ -746,12 +746,9 @@ Timeline.TimelinePanel = class extends UI.Panel {
     const markers = new Map();
     const recordTypes = TimelineModel.TimelineModel.RecordType;
     const zeroTime = timelineModel.minimumRecordTime();
-    const filter = Timeline.TimelineUIUtils.paintEventsFilter();
     for (const event of timelineModel.timeMarkerEvents()) {
       if (event.name === recordTypes.TimeStamp || event.name === recordTypes.ConsoleTime)
         continue;
-      if (!filter.accept(event))
-        continue;
       markers.set(event.startTime, Timeline.TimelineUIUtils.createEventDivider(event, zeroTime));
     }
     this._overviewPane.setMarkers(markers);

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

@@ -1523,15 +1523,6 @@ Timeline.TimelineUIUtils = class {
     return new TimelineModel.TimelineVisibleEventsFilter(Timeline.TimelineUIUtils._visibleTypes());
   }
 
-  /**
-   * @return {!TimelineModel.TimelineModelFilter}
-   */
-  static paintEventsFilter() {
-    const recordTypes = TimelineModel.TimelineModel.RecordType;
-    return new TimelineModel.TimelineInvisibleEventsFilter(
-        Runtime.experiments.isEnabled('timelinePaintTimingMarkers') ? [] : [recordTypes.MarkFCP, recordTypes.MarkFMP]);
-  }
-
   /**
    * @return {!Object.<string, !Timeline.TimelineCategory>}
    */

third_party/blink/web_tests/http/tests/devtools/tracing/timeline-misc/timeline-page-metrics.js

@@ -4,7 +4,6 @@
 
 (async function() {
   TestRunner.addResult(`Test timeline page metrics.\n`);
-  Runtime.experiments.enableForTest('timelinePaintTimingMarkers');
   await TestRunner.loadModule('performance_test_runner');
   await TestRunner.showPanel('timeline');
 

third_party/blink/web_tests/http/tests/devtools/tracing/timeline-misc/timeline-search-expected.txt

 Test search in Timeline FlameChart View.
 
+Count: 7
+2010: B TimeStamp CrRendererMain
 2010: B TimeStamp CrRendererMain
 2011: X RasterTask CompositorTileWorker
 2100: S Painting CrRendererMain

third_party/blink/web_tests/http/tests/devtools/tracing/timeline-misc/timeline-search.js

@@ -204,7 +204,8 @@
   var flameChartView = timeline._flameChart;
   var searchConfig = new UI.SearchableView.SearchConfig('Paint', false, false);
   flameChartView.performSearch(searchConfig, true, false);
-  for (var i = 0; i < 7; ++i) {
+  TestRunner.addResult(`Count: ${flameChartView._searchResults.length}`);
+  for (var i = 0; i <= flameChartView._searchResults.length; ++i) {
     var selection = timeline._selection;
     if (!selection || selection.type() !== Timeline.TimelineSelection.Type.TraceEvent) {
       TestRunner.addResult(`Invalid selection type: ${selection && selection.type()}`);