devtools-timeline-model - npm Package Compare versions

Comparing version 1.1.4 to 1.1.5

index.js

@@ -8,4 +8,3 @@ 'use strict';
 if (typeof __dirname === 'undefined') {
-  process = process || {};
-  __dirname = {};
+  __dirname = '';
 }
@@ -20,3 +19,3 @@ /* eslint-enable no-native-reassign */
     // First, sandboxed contexts don't have any globals from node, so we whitelist a few we'll provide for it.
-    var glob = {require: require, global: global, console: console, process: process, __dirname: __dirname};
+    var glob = {require: require, global: global, console: console, __dirname: __dirname};
     // We read in our script to run, and create a vm.Script object
@@ -23,0 +22,0 @@ /* eslint-disable no-path-concat */

lib/timeline-model.js

@@ -30,18 +30,19 @@ 'use strict';
 requireval('chrome-devtools-frontend/front_end/common/Object.js');
-requireval('chrome-devtools-frontend/front_end/common/SegmentedRange.js');
 requireval('chrome-devtools-frontend/front_end/platform/utilities.js');
 requireval('chrome-devtools-frontend/front_end/sdk/Target.js');
+requireval('chrome-devtools-frontend/front_end/common/SegmentedRange.js');
 requireval('chrome-devtools-frontend/front_end/bindings/TempFile.js');
 requireval('chrome-devtools-frontend/front_end/sdk/TracingModel.js');
-requireval('chrome-devtools-frontend/front_end/timeline/TimelineJSProfile.js');
+requireval('chrome-devtools-frontend/front_end/sdk/ProfileTreeModel.js');
 requireval('chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js');
+requireval('chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js');
 requireval('chrome-devtools-frontend/front_end/sdk/CPUProfileDataModel.js');
-requireval('chrome-devtools-frontend/front_end/timeline/LayerTreeModel.js');
-requireval('chrome-devtools-frontend/front_end/timeline/TimelineModel.js');
+requireval('chrome-devtools-frontend/front_end/timeline_model/LayerTreeModel.js');
+requireval('chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js');
+requireval('chrome-devtools-frontend/front_end/ui_lazy/SortableDataGrid.js');
 requireval('chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js');
-requireval('chrome-devtools-frontend/front_end/ui_lazy/SortableDataGrid.js');
-requireval('chrome-devtools-frontend/front_end/timeline/TimelineProfileTree.js');
+requireval('chrome-devtools-frontend/front_end/timeline_model/TimelineProfileTree.js');
 requireval('chrome-devtools-frontend/front_end/components_lazy/FilmStripModel.js');
-requireval('chrome-devtools-frontend/front_end/timeline/TimelineIRModel.js');
-requireval('chrome-devtools-frontend/front_end/timeline/TimelineFrameModel.js');
+requireval('chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js');
+requireval('chrome-devtools-frontend/front_end/timeline_model/TimelineFrameModel.js');
 
@@ -51,3 +52,3 @@ // minor configurations
 // polyfill the bottom-up and topdown tree sorting
-const TreeView = require('./lib/timeline-model-treeview.js')(WebInspector);
+const TimelineModelTreeView = require('./lib/timeline-model-treeview.js')(WebInspector);
 
@@ -66,3 +67,2 @@ class SandboxedModel {
 
-    // convert string (e.g. via fs.readFileSync) to JS
     if (typeof events === 'string') events = JSON.parse(events);
@@ -74,12 +74,13 @@ // WebPagetest trace files put events in object under key `traceEvents`
     this._tracingModel.reset();
-    this._tracingModel.addEvents(typeof events === 'string' ? JSON.parse(events) : events);
+    this._tracingModel.addEvents(events);
     this._tracingModel.tracingComplete();
     this._timelineModel.setEvents(this._tracingModel);
 
-    this._aggregator = new WebInspector.TimelineAggregator(event =>
-      WebInspector.TimelineUIUtils.eventStyle(event).category.name);
-
     return this;
   }
 
+  _createAggregator() {
+    return WebInspector.AggregatedTimelineTreeView.prototype._createAggregator();
+  }
+
   timelineModel() {
@@ -104,4 +105,5 @@ return this._timelineModel;
 
-    return WebInspector.TimelineProfileTree.buildTopDown(this._timelineModel.mainThreadEvents(),
-                  filters, /* startTime */ 0, /* endTime */ Infinity, WebInspector.TimelineAggregator.eventId);
+    var topDown = WebInspector.TimelineProfileTree.buildTopDown(this._timelineModel.mainThreadEvents(),
+      filters, /* startTime */ 0, /* endTime */ Infinity, WebInspector.TimelineAggregator.eventId);
+    return topDown;
   }
@@ -112,3 +114,3 @@
     var noGrouping = WebInspector.TimelineAggregator.GroupBy.None;
-    var noGroupAggregator = this._aggregator.groupFunction(noGrouping);
+    var noGroupAggregator = this._createAggregator().groupFunction(noGrouping);
     return WebInspector.TimelineProfileTree.buildBottomUp(topDown, noGroupAggregator);
@@ -125,7 +127,7 @@ }
     var groupSetting = WebInspector.TimelineAggregator.GroupBy[grouping];
-    var groupingAggregator = this._aggregator.groupFunction(groupSetting);
+    var groupingAggregator = this._createAggregator().groupFunction(groupSetting);
     var bottomUpGrouped = WebInspector.TimelineProfileTree.buildBottomUp(topDown, groupingAggregator);
 
     // sort the grouped tree, in-place
-    new TreeView(bottomUpGrouped).sortingChanged('self', 'desc');
+    new TimelineModelTreeView(bottomUpGrouped).sortingChanged('self', 'desc');
     return bottomUpGrouped;
@@ -135,5 +137,7 @@ }
   frameModel() {
-    var frameModel = new WebInspector.TracingTimelineFrameModel();
-    frameModel.addTraceEvents({ /* target */ }, this._timelineModel.inspectedTargetEvents(),
-      this._timelineModel.sessionId() || '');
+    var frameModel = new WebInspector.TimelineFrameModel(event =>
+      WebInspector.TimelineUIUtils.eventStyle(event).category.name
+    );
+    frameModel.addTraceEvents({ /* target */ },
+      this._timelineModel.inspectedTargetEvents(), this._timelineModel.sessionId() || '');
     return frameModel;
@@ -140,0 +144,0 @@ }

package.json

 {
   "name": "devtools-timeline-model",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Parse raw trace data into the Chrome DevTools' structured profiling data models",
@@ -30,3 +30,3 @@ "license": "Apache-2.0",
   "dependencies": {
-    "chrome-devtools-frontend": "1.0.382117",
+    "chrome-devtools-frontend": "1.0.401423",
     "resolve": "1.1.7"
@@ -33,0 +33,0 @@ },

No alert changes

Improved metrics

Total package byte prevSize

71502

increased by223.09%

Number of package files

17

increased by30.77%

Lines of code

360

increased by0.84%

Dependency changes

• + Addedchrome-devtools-frontend@1.0.401423(transitive)

• - Removedchrome-devtools-frontend@1.0.382117(transitive)

• Updatedchrome-devtools-frontend@1.0.401423