DevTools: Make network events continuous on Timeline

third_party/WebKit/Source/devtools/front_end/timeline/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 90 matching lines @@
     EvaluateScript: "EvaluateScript",
 
     CommitLoad: "CommitLoad",
     MarkLoad: "MarkLoad",
     MarkDOMContent: "MarkDOMContent",
     MarkFirstPaint: "MarkFirstPaint",
 
     TimeStamp: "TimeStamp",
     ConsoleTime: "ConsoleTime",
 
+    ResourceFetcherRequestResource: "ResourceFetcher::requestResource",
+    ResourceDispatcherOnReceivedData: "ResourceDispatcher::OnReceivedData",
+    ResourceDispatcherOnReceivedResponse: "ResourceDispatcher::OnReceivedResponse",
+    ResourceDispatcherOnRequestComplete: "ResourceDispatcher::OnRequestComplete",
+
     ResourceSendRequest: "ResourceSendRequest",
     ResourceReceiveResponse: "ResourceReceiveResponse",
     ResourceReceivedData: "ResourceReceivedData",
     ResourceFinish: "ResourceFinish",
 
     FunctionCall: "FunctionCall",
     GCEvent: "GCEvent", // For backwards compatibility only, now replaced by MinorGC/MajorGC.
     MajorGC: "MajorGC",
     MinorGC: "MinorGC",
     JSFrame: "JSFrame",
@@ skipping 938 matching lines @@
             groupAsyncEvents.push(asyncEvent);
         }
     },
 
     /**
      * @param {!WebInspector.TracingModel.Event} event
      * @return {boolean}
      */
     _processEvent: function(event)
     {
+        /**
+         * @param {!Object} dest
+         * @param {!Object} source
+         */
+        function mergeData(dest, source)
+        {
+            for (var field in source)
+               dest[field] = dest[field] || source[field];
+        }
+        /**
+         * @param {!WebInspector.TracingModel.Event} event
+         * @param {!WebInspector.TimelineModel.RecordType} parentType
+         * @this {WebInspector.TimelineModel}
+         */
+        function processNetworkEvent(event, parentType)

[caseq, 2015/11/06 21:38:38]

nit: I'd extract this to a member function.

[alph, 2015/11/06 22:16:31]

Done.

+        {
+            var parent = this._findAncestorEvent(parentType);
+            if (!parent)
+                return;
+            if (!parent.args["data"])
+                parent.args["data"] = {};
+            var eventData = event.args["data"];
+            mergeData(parent.args["data"], eventData);
+            parent.stackTrace = parent.stackTrace || event.stackTrace;
+            parent.initiator = parent.initiator || event.initiator;
+            var url = eventData["url"] || event.initiator && event.initiator.url;
+            event.url = url;
+            parent.url = url;
+        }
+
         var eventStack = this._eventStack;
         while (eventStack.length && eventStack.peekLast().endTime <= event.startTime)
             eventStack.pop();
 
         var recordTypes = WebInspector.TimelineModel.RecordType;
 
         if (this._currentScriptEvent && event.startTime > this._currentScriptEvent.endTime)
             this._currentScriptEvent = null;
 
         var eventData = event.args["data"] || event.args["beginData"] || {};
         if (eventData && eventData["stackTrace"])
             event.stackTrace = eventData["stackTrace"];
 
         if (eventStack.length && eventStack.peekLast().name === recordTypes.EventDispatch)
             eventStack.peekLast().hasChildren = true;
         this._asyncEventTracker.processEvent(event);
         if (event.initiator && event.initiator.url)
             event.url = event.initiator.url;
         switch (event.name) {
         case recordTypes.ResourceSendRequest:
+            processNetworkEvent.call(this, event, recordTypes.ResourceFetcherRequestResource);
+            break;
+
+        case recordTypes.ResourceReceiveResponse:
+            processNetworkEvent.call(this, event, recordTypes.ResourceDispatcherOnReceivedResponse);
+            break;
+
+        case recordTypes.ResourceReceivedData:
+            processNetworkEvent.call(this, event, recordTypes.ResourceDispatcherOnReceivedData);
+            break;
+
+        case recordTypes.ResourceFinish:
+            processNetworkEvent.call(this, event, recordTypes.ResourceDispatcherOnRequestComplete);
+            break;
+
         case recordTypes.WebSocketCreate:
             event.url = event.args["data"]["url"];
             break;
 
         case recordTypes.ScheduleStyleRecalculation:
             this._lastScheduleStyleRecalculation[event.args["data"]["frame"]] = event;
             break;
 
         case recordTypes.UpdateLayoutTree:
         case recordTypes.RecalculateStyles:
@@ skipping 1300 matching lines @@
         if (!id)
             return;
         /** @type {!Map<string, !WebInspector.TracingModel.Event>|undefined} */
         var initiatorMap = this._initiatorByType.get(initiatorType);
         if (isInitiator)
             initiatorMap.set(id, event);
         else
             event.initiator = initiatorMap.get(id) || null;
     }
 }