DevTools: Support reading updated version of CPU profile.

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 143 matching lines @@
     LatencyInfoFlow: "LatencyInfo.Flow",
     InputLatencyMouseMove: "InputLatency::MouseMove",
     InputLatencyMouseWheel: "InputLatency::MouseWheel",
     ImplSideFling: "InputHandlerProxy::HandleGestureFling::started",
     GCIdleLazySweep: "ThreadState::performIdleLazySweep",
     GCCompleteSweep: "ThreadState::completeSweep",
     GCCollectGarbage: "BlinkGCMarking",
 
     // CpuProfile is a virtual event created on frontend to support
     // serialization of CPU Profiles within tracing timeline data.
-    CpuProfile: "CpuProfile"
+    CpuProfile: "CpuProfile",
+    Profile: "Profile"
 }
 
 WebInspector.TimelineModel.Category = {
     Console: "blink.console",
     UserTiming: "blink.user_timing",
     LatencyInfo: "latencyInfo"
 };
 
 /**
  * @enum {string}
@@ skipping 570 matching lines @@
         var cpuProfile;
 
         // Check for legacy CpuProfile event format first.
         var cpuProfileEvent = events.peekLast();
         if (cpuProfileEvent && cpuProfileEvent.name === WebInspector.TimelineModel.RecordType.CpuProfile) {
             var eventData = cpuProfileEvent.args["data"];
             cpuProfile = /** @type {?ProfilerAgent.Profile} */ (eventData && eventData["cpuProfile"]);
         }
 
         if (!cpuProfile) {
-            cpuProfileEvent = events.find(e => e.name === WebInspector.TimelineModel.RecordType.CpuProfile);
+            cpuProfileEvent = events.find(e => e.name === WebInspector.TimelineModel.RecordType.Profile);
             if (!cpuProfileEvent)
                 return null;
             var profileGroup = tracingModel.profileGroup(cpuProfileEvent.id);
             if (!profileGroup) {
                 WebInspector.console.error("Invalid CPU profile format.");
                 return null;
             }
             cpuProfile = /** @type {!ProfilerAgent.Profile} */ ({
                 startTime: cpuProfileEvent.args["data"]["startTime"],
                 endTime: 0,
                 nodes: [],
                 samples: [],
                 timeDeltas: []
             });
             for (var profileEvent of profileGroup.children) {
                 var eventData = profileEvent.args["data"];
                 if ("startTime" in eventData)
                     cpuProfile.startTime = eventData["startTime"];
                 if ("endTime" in eventData)
                     cpuProfile.endTime = eventData["endTime"];
-                cpuProfile.nodes.pushAll(eventData["nodes"] || []);
-                cpuProfile.samples.pushAll(eventData["samples"] || []);
+                var nodesAndSamples = eventData["cpuProfile"] || {};
+                cpuProfile.nodes.pushAll(nodesAndSamples["nodes"] || []);
+                cpuProfile.samples.pushAll(nodesAndSamples["samples"] || []);
                 cpuProfile.timeDeltas.pushAll(eventData["timeDeltas"] || []);
+                if (cpuProfile.samples.length !== cpuProfile.timeDeltas.length) {
+                    WebInspector.console.error("Failed to parse CPU profile.");
+                    return null;
+                }
             }
             if (!cpuProfile.endTime)
                 cpuProfile.endTime = cpuProfile.timeDeltas.reduce((x, y) => x + y, cpuProfile.startTime);
         }
 
         try {
             var jsProfileModel = new WebInspector.CPUProfileDataModel(cpuProfile);
             this._cpuProfiles.push(jsProfileModel);
             return jsProfileModel;
         } catch (e) {
@@ skipping 1058 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;
     }
 }