DevTools: brush up paint marker rendering, sort experiments, restore event markers on the overview.

third_party/WebKit/Source/devtools/front_end/timeline_model/TimelineModel.js

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 88 matching lines @@
 
   /**
    * @param {!SDK.TracingModel.Event} event
    * @return {boolean}
    */
   static isMarkerEvent(event) {
     const recordTypes = TimelineModel.TimelineModel.RecordType;
     switch (event.name) {
       case recordTypes.TimeStamp:
       case recordTypes.MarkFirstPaint:
-      case recordTypes.FirstTextPaint:
-      case recordTypes.FirstImagePaint:
-      case recordTypes.FirstMeaningfulPaint:
-      case recordTypes.FirstPaint:
-      case recordTypes.FirstContentfulPaint:
+      case recordTypes.MarkFMP:
+      case recordTypes.MarkFMPCandidate:
         return true;
       case recordTypes.MarkDOMContent:
       case recordTypes.MarkLoad:
         return event.args['data']['isMainFrame'];
       default:
         return false;
     }
   }
 
   /**
@@ skipping 959 matching lines @@
 
   XHRReadyStateChange: 'XHRReadyStateChange',
   XHRLoad: 'XHRLoad',
   CompileScript: 'v8.compile',
   EvaluateScript: 'EvaluateScript',
 
   CommitLoad: 'CommitLoad',
   MarkLoad: 'MarkLoad',
   MarkDOMContent: 'MarkDOMContent',
   MarkFirstPaint: 'MarkFirstPaint',
+  MarkFMP: 'firstMeaningfulPaint',
+  MarkFMPCandidate: 'firstMeaningfulPaintCandidate',
 
   TimeStamp: 'TimeStamp',
   ConsoleTime: 'ConsoleTime',
   UserTiming: 'UserTiming',
 
-  FirstTextPaint: 'firstTextPaint',
-  FirstImagePaint: 'firstImagePaint',
-  FirstMeaningfulPaint: 'firstMeaningfulPaint',
-  FirstPaint: 'firstPaint',
-  FirstContentfulPaint: 'firstContentfulPaint',
-
   ResourceSendRequest: 'ResourceSendRequest',
   ResourceReceiveResponse: 'ResourceReceiveResponse',
   ResourceReceivedData: 'ResourceReceivedData',
   ResourceFinish: 'ResourceFinish',
 
   RunMicrotasks: 'RunMicrotasks',
   FunctionCall: 'FunctionCall',
   GCEvent: 'GCEvent',  // For backwards compatibility only, now replaced by MinorGC/MajorGC.
   MajorGC: 'MajorGC',
   MinorGC: 'MinorGC',
@@ skipping 690 matching lines @@
     var data = event[TimelineModel.TimelineData._symbol];
     if (!data) {
       data = new TimelineModel.TimelineData();
       event[TimelineModel.TimelineData._symbol] = data;
     }
     return data;
   }
 };
 
 TimelineModel.TimelineData._symbol = Symbol('timelineData');