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

Index: third_party/WebKit/Source/devtools/front_end/timeline_model/TimelineModel.js
diff --git a/third_party/WebKit/Source/devtools/front_end/timeline_model/TimelineModel.js b/third_party/WebKit/Source/devtools/front_end/timeline_model/TimelineModel.js
index d9e3925e16f3239f405a77ba8564a1eb57530692..bcdfdf2c5d8a11014343b7aeb8648e527ff462c7 100644
--- a/third_party/WebKit/Source/devtools/front_end/timeline_model/TimelineModel.js
+++ b/third_party/WebKit/Source/devtools/front_end/timeline_model/TimelineModel.js
@@ -106,11 +106,8 @@ TimelineModel.TimelineModel = class {
     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:
@@ -1090,17 +1087,13 @@ TimelineModel.TimelineModel.RecordType = {
   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',