DevTools: Make network events continuous on Timeline

third_party/WebKit/Source/devtools/front_end/timeline/TimelineUIUtils.js

Index: third_party/WebKit/Source/devtools/front_end/timeline/TimelineUIUtils.js
diff --git a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineUIUtils.js b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineUIUtils.js
index f5f07ae59f88b93dd9ff529d778f5df49fac084a..bac137f83a34439c0c796bd1a7049b74a56a86e5 100644
--- a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineUIUtils.js
+++ b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineUIUtils.js
@@ -95,10 +95,10 @@ WebInspector.TimelineUIUtils._initEventStyles = function()
     eventStyles[recordTypes.MarkFirstPaint] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("First paint"), categories["painting"], true);
     eventStyles[recordTypes.TimeStamp] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Timestamp"), categories["scripting"]);
     eventStyles[recordTypes.ConsoleTime] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Console Time"), categories["scripting"]);
-    eventStyles[recordTypes.ResourceSendRequest] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Send Request"), categories["loading"]);
-    eventStyles[recordTypes.ResourceReceiveResponse] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Receive Response"), categories["loading"]);
-    eventStyles[recordTypes.ResourceFinish] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Finish Loading"), categories["loading"]);
-    eventStyles[recordTypes.ResourceReceivedData] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Receive Data"), categories["loading"]);
+    eventStyles[recordTypes.ResourceFetcherRequestResource] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Send Request"), categories["loading"]);
+    eventStyles[recordTypes.ResourceDispatcherOnReceivedResponse] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Receive Response"), categories["loading"]);
+    eventStyles[recordTypes.ResourceDispatcherOnRequestComplete] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Request Complete"), categories["loading"]);
+    eventStyles[recordTypes.ResourceDispatcherOnReceivedData] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Receive Data"), categories["loading"]);
     eventStyles[recordTypes.FunctionCall] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Function Call"), categories["scripting"]);
     eventStyles[recordTypes.GCEvent] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("GC Event"), categories["scripting"]);
     eventStyles[recordTypes.MajorGC] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Major GC"), categories["scripting"]);
@@ -346,10 +346,10 @@ WebInspector.TimelineUIUtils.buildDetailsTextForTraceEvent = function(event, tar
     case recordType.WebSocketSendHandshakeRequest:
     case recordType.WebSocketReceiveHandshakeResponse:
     case recordType.WebSocketDestroy:
-    case recordType.ResourceSendRequest:
-    case recordType.ResourceReceivedData:
-    case recordType.ResourceReceiveResponse:
-    case recordType.ResourceFinish:
+    case recordType.ResourceFetcherRequestResource:
+    case recordType.ResourceDispatcherOnReceivedData:
+    case recordType.ResourceDispatcherOnReceivedResponse:
+    case recordType.ResourceDispatcherOnRequestComplete:
     case recordType.PaintImage:
     case recordType.DecodeImage:
     case recordType.ResizeImage:
@@ -444,10 +444,10 @@ WebInspector.TimelineUIUtils.buildDetailsNodeForTraceEvent = function(event, tar
     case recordType.DecodeLazyPixelRef:
     case recordType.XHRReadyStateChange:
     case recordType.XHRLoad:
-    case recordType.ResourceSendRequest:
-    case recordType.ResourceReceivedData:
-    case recordType.ResourceReceiveResponse:
-    case recordType.ResourceFinish:
+    case recordType.ResourceFetcherRequestResource:
+    case recordType.ResourceDispatcherOnReceivedData:
+    case recordType.ResourceDispatcherOnReceivedResponse:
+    case recordType.ResourceDispatcherOnRequestComplete:
         if (event.url)
             details = WebInspector.linkifyResourceAsNode(event.url);
         break;
@@ -629,11 +629,11 @@ WebInspector.TimelineUIUtils._buildTraceEventDetailsSynchronously = function(eve
         if (eventData["scriptName"])
             contentHelper.appendLocationRow(WebInspector.UIString("Location"), eventData["scriptName"], eventData["scriptLine"]);
         break;
-    case recordTypes.ResourceSendRequest:
-    case recordTypes.ResourceReceiveResponse:
-    case recordTypes.ResourceReceivedData:
-    case recordTypes.ResourceFinish:
-        var url = (event.name === recordTypes.ResourceSendRequest) ? eventData["url"] : initiator && initiator.args["data"]["url"];
+    case recordTypes.ResourceFetcherRequestResource:
+    case recordTypes.ResourceDispatcherOnReceivedData:
+    case recordTypes.ResourceDispatcherOnReceivedResponse:
+    case recordTypes.ResourceDispatcherOnRequestComplete:
+        var url = (event.name === recordTypes.ResourceFetcherRequestResource) ? eventData["url"] : initiator && initiator.args["data"]["url"];
         if (url)
             contentHelper.appendElementRow(WebInspector.UIString("Resource"), WebInspector.linkifyResourceAsNode(url));
         if (eventData["requestMethod"])
@@ -955,11 +955,10 @@ WebInspector.TimelineUIUtils._generateCauses = function(event, target, contentHe
         contentHelper.appendStackTrace(stackLabel || WebInspector.UIString("Stack trace"), event.stackTrace);
 
     // Indirect causes.
-    if (event.invalidationTrackingEvents && target) { // Full invalidation tracking (experimental).
+    if (event.invalidationTrackingEvents && target) // Full invalidation tracking (experimental).
         WebInspector.TimelineUIUtils._generateInvalidations(event, target, contentHelper);
-    } else if (initiator && initiator.stackTrace) { // Partial invalidation tracking.
+    else if (initiator && initiator.stackTrace) // Partial invalidation tracking.
         contentHelper.appendStackTrace(callSiteStackLabel || WebInspector.UIString("First invalidated"), initiator.stackTrace);
-    }
 }
 
 /**