DevTools: Make network events continuous on Timeline

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2012 Intel 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.
@@ skipping 81 matching lines @@
     eventStyles[recordTypes.EvaluateScript] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Evaluate Script"), categories["scripting"]);
     eventStyles[recordTypes.MarkLoad] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Load event"), categories["scripting"], true);
     eventStyles[recordTypes.MarkDOMContent] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("DOMContentLoaded event"), categories["scripting"], true);
     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"]);
     eventStyles[recordTypes.MinorGC] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Minor GC"), categories["scripting"]);
     eventStyles[recordTypes.JSFrame] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("JS Frame"), categories["scripting"]);
     eventStyles[recordTypes.RequestAnimationFrame] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Request Animation Frame"), categories["scripting"]);
     eventStyles[recordTypes.CancelAnimationFrame] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Cancel Animation Frame"), categories["scripting"]);
     eventStyles[recordTypes.FireAnimationFrame] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Animation Frame Fired"), categories["scripting"]);
     eventStyles[recordTypes.RequestIdleCallback] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Request Idle Callback"), categories["scripting"]);
     eventStyles[recordTypes.CancelIdleCallback] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Cancel Idle Callback"), categories["scripting"]);
@@ skipping 231 matching lines @@
         break;
 
     case recordType.WebSocketCreate:
     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:
     case recordType.DecodeLazyPixelRef:
         if (event.url)
             detailsText = WebInspector.displayNameForURL(event.url);
         break;
 
     case recordType.EmbedderCallback:
         detailsText = eventData["callbackName"];
@@ skipping 78 matching lines @@
     case recordType.PaintImage:
     case recordType.DecodeImage:
     case recordType.ResizeImage:
     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;
     case recordType.FunctionCall:
         details = linkifyLocation(eventData["scriptId"], eventData["scriptName"], eventData["scriptLine"], 0);
         break;
     case recordType.JSFrame:
         details = createElement("span");
         details.createTextChild(WebInspector.beautifyFunctionName(eventData["functionName"]));
         var location = linkifyLocation(eventData["scriptId"], eventData["url"], eventData["lineNumber"], eventData["columnNumber"]);
@@ skipping 165 matching lines @@
         contentHelper.appendTextRow(WebInspector.UIString("Callback ID"), eventData["id"]);
         break;
     case recordTypes.FunctionCall:
         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 || event.name === recordTypes.ResourceSendRequest) ? eventData["url"] : initiator && initiator.args["data"]["url"];
         if (url)
             contentHelper.appendElementRow(WebInspector.UIString("Resource"), WebInspector.linkifyResourceAsNode(url));
         if (eventData["requestMethod"])
             contentHelper.appendTextRow(WebInspector.UIString("Request Method"), eventData["requestMethod"]);
         if (typeof eventData["statusCode"] === "number")
             contentHelper.appendTextRow(WebInspector.UIString("Status Code"), eventData["statusCode"]);
         if (eventData["mimeType"])
             contentHelper.appendTextRow(WebInspector.UIString("MIME Type"), eventData["mimeType"]);
         if (eventData["encodedDataLength"])
             contentHelper.appendTextRow(WebInspector.UIString("Encoded Data Length"), WebInspector.UIString("%d Bytes", eventData["encodedDataLength"]));
@@ skipping 301 matching lines @@
         callSiteStackLabel = WebInspector.UIString("First layout invalidation");
         stackLabel = WebInspector.UIString("Layout forced");
         break;
     }
 
     // Direct cause.
     if (event.stackTrace)
         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);
-    }
 }
 
 /**
  * @param {!WebInspector.TracingModel.Event} event
  * @param {!WebInspector.Target} target
  * @param {!WebInspector.TimelineDetailsContentHelper} contentHelper
  */
 WebInspector.TimelineUIUtils._generateInvalidations = function(event, target, contentHelper)
 {
     if (!event.invalidationTrackingEvents)
@@ skipping 1085 matching lines @@
                 WebInspector.UIString("Not optimized"), undefined, true));
             span.createTextChild(WebInspector.UIString(": %s", eventData["deoptReason"]));
             break;
         default:
             console.assert(false, "Unhandled TimelineModel.WarningType");
         }
 
         this.appendElementRow(WebInspector.UIString("Warning"), span, true);
     }
 }