DevTools: extract TimelineModel.Record from TimelinePresentationModel.Record.

Source/devtools/front_end/TimelinePanel.js

 /*
  * Copyright (C) 2012 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 218 matching lines @@
                 views.mainViews = [new WebInspector.TimelineView(this, this._model, this._presentationModel, null)];
                 break;
             case WebInspector.TimelinePanel.Mode.Frames:
                 views.overviewView = new WebInspector.TimelineFrameOverview(this._model, this.frameModel());
                 views.mainViews = [new WebInspector.TimelineView(this, this._model, this._presentationModel, this.frameModel())];
                 break;
             case WebInspector.TimelinePanel.Mode.Memory:
                 views.overviewView = new WebInspector.TimelineMemoryOverview(this._model);
                 var timelineView = new WebInspector.TimelineView(this, this._model, this._presentationModel, null);
                 views.mainViews = [timelineView];
-                var memoryStatistics = new WebInspector.CountersGraph(this, this._presentationModel);
+                var memoryStatistics = new WebInspector.CountersGraph(this, this._model);
                 views.mainViews.push(memoryStatistics);
                 break;
             case WebInspector.TimelinePanel.Mode.FlameChart:
                 views.overviewView = new WebInspector.TimelineFrameOverview(this._model, this.frameModel());
                 views.mainViews = [
                     new WebInspector.TimelineFlameChart(this, this._model, this.frameModel(), true),
                     new WebInspector.TimelineFlameChart(this, this._model, this.frameModel(), false)
                 ];
                 break;
             default:
@@ skipping 103 matching lines @@
         }
         return this._filterBar;
     },
 
     _textFilterChanged: function(event)
     {
         var searchQuery = this._filters._textFilterUI.value();
         this._presentationModel.setSearchFilter(null);
         delete this._searchFilter;
 
-        function cleanRecord(record)
-        {
-            delete record.clicked;
-        }
-        WebInspector.TimelinePresentationModel.forAllRecords(this._presentationModel.rootRecord().children, cleanRecord);
-
         this.searchCanceled();
         if (searchQuery) {
             this._searchFilter = new WebInspector.TimelineSearchFilter(createPlainTextSearchRegex(searchQuery, "i"));
             this._presentationModel.setSearchFilter(this._searchFilter);
         }
         this._refreshViews();
     },
 
     _durationFilterChanged: function()
     {
@@ skipping 222 matching lines @@
     },
 
     _onRecordingStopped: function()
     {
         this.toggleTimelineButton.title = WebInspector.UIString("Record");
         this.toggleTimelineButton.toggled = false;
     },
 
     _onRecordAdded: function(event)
     {
-        this._addRecord(/** @type {!TimelineAgent.TimelineEvent} */(event.data));
+        this._addRecord(/** @type {!WebInspector.TimelineModel.Record} */(event.data));
     },
 
     /**
-     * @param {!TimelineAgent.TimelineEvent} record
+     * @param {!WebInspector.TimelineModel.Record} record
      */
     _addRecord: function(record)
     {
-        var presentationRecords = this._presentationModel.addRecord(record);
-
+        this._presentationModel.addRecord(record);
         if (this._frameModel)
             this._frameModel.addRecord(record);
         for (var i = 0; i < this._currentViews.length; ++i)
-            this._currentViews[i].addRecord(record, presentationRecords);
-
+            this._currentViews[i].addRecord(record);
         this._overviewPane.addRecord(record);
 
         this._updateSearchHighlight(false, true);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _willReloadPage: function(event)
     {
@@ skipping 65 matching lines @@
 
     _updateSearchResults: function(shouldJump)
     {
         var searchRegExp = this._searchRegExp;
         if (!searchRegExp)
             return;
 
         var matches = [];
         var presentationModel = this._presentationModel;
 
+        /**
+         * @param {!WebInspector.TimelineModel.Record} record
+         */
         function processRecord(record)
         {
             if (presentationModel.isVisible(record) && record.testContentMatching(searchRegExp))
                 matches.push(record);
             return false;
         }
-        WebInspector.TimelinePresentationModel.forAllRecords(presentationModel.rootRecord().children, processRecord);
+        this._model.forAllRecords(processRecord);
 
         var matchesCount = matches.length;
         if (matchesCount) {
             this._searchResults = matches;
             this._searchableView.updateSearchMatchesCount(matchesCount);
 
             var selectedIndex = matches.indexOf(this._selectedSearchResult);
             if (shouldJump && selectedIndex === -1)
                 selectedIndex = 0;
             this._selectSearchResult(selectedIndex);
@@ skipping 27 matching lines @@
         var startTime = this._windowStartTime;
         var endTime = this._windowEndTime;
         // Return early in case 0 selection window.
         if (startTime < 0)
             return;
 
         var aggregatedStats = {};
 
         /**
          * @param {number} value
-         * @param {!TimelineAgent.TimelineEvent} task
+         * @param {!WebInspector.TimelineModel.Record} task
          * @return {number}
          */
         function compareEndTime(value, task)
         {
             return value < task.endTime ? -1 : 1;
         }
 
         /**
-         * @param {!TimelineAgent.TimelineEvent} rawRecord
+         * @param {!WebInspector.TimelineModel.Record} record
          */
-        function aggregateTimeForRecordWithinWindow(rawRecord)
+        function aggregateTimeForRecordWithinWindow(record)
         {
-            if (!rawRecord.endTime || rawRecord.endTime < startTime || rawRecord.startTime > endTime)
+            if (!record.endTime || record.endTime < startTime || record.startTime > endTime)
                 return;
 
             var childrenTime = 0;
-            var children = rawRecord.children || [];
+            var children = record.children || [];
             for (var i = 0; i < children.length; ++i) {
                 var child = children[i];
                 if (!child.endTime || child.endTime < startTime || child.startTime > endTime)
                     continue;
                 childrenTime += Math.min(endTime, child.endTime) - Math.max(startTime, child.startTime);
                 aggregateTimeForRecordWithinWindow(child);
             }
-            var categoryName = WebInspector.TimelineUIUtils.categoryForRecord(rawRecord).name;
-            var ownTime = Math.min(endTime, rawRecord.endTime) - Math.max(startTime, rawRecord.startTime) - childrenTime;
+            var categoryName = WebInspector.TimelineUIUtils.categoryForRecord(record).name;
+            var ownTime = Math.min(endTime, record.endTime) - Math.max(startTime, record.startTime) - childrenTime;
             aggregatedStats[categoryName] = (aggregatedStats[categoryName] || 0) + ownTime;
         }
 
         var mainThreadTasks = this._presentationModel.mainThreadTasks();
         var taskIndex = insertionIndexForObjectInListSortedByFunction(startTime, mainThreadTasks, compareEndTime);
         for (; taskIndex < mainThreadTasks.length; ++taskIndex) {
             var task = mainThreadTasks[taskIndex];
             if (task.startTime > endTime)
                 break;
             aggregateTimeForRecordWithinWindow(task);
         }
 
         var aggregatedTotal = 0;
         for (var categoryName in aggregatedStats)
             aggregatedTotal += aggregatedStats[categoryName];
         aggregatedStats["idle"] = Math.max(0, endTime - startTime - aggregatedTotal);
 
         var fragment = document.createDocumentFragment();
         fragment.appendChild(WebInspector.TimelineUIUtils.generatePieChart(aggregatedStats));
         var startOffset = startTime - this._model.minimumRecordTime();
         var endOffset = endTime - this._model.minimumRecordTime();
         var title = WebInspector.UIString("%s \u2013 %s", Number.millisToString(startOffset), Number.millisToString(endOffset));
         this._detailsView.setContent(title, fragment);
     },
 
     /**
-     * @param {?WebInspector.TimelinePresentationModel.Record} record
+     * @param {?WebInspector.TimelineModel.Record} record
      */
     selectRecord: function(record)
     {
         this._detailsLinkifier.reset();
 
         if (!record) {
             this._updateSelectionDetails();
             return;
         }
 
@@ skipping 71 matching lines @@
 WebInspector.TimelineModeView = function()
 {
 }
 
 WebInspector.TimelineModeView.prototype = {
     reset: function() {},
 
     refreshRecords: function() {},
 
     /**
-     * @param {!TimelineAgent.TimelineEvent} record
-     * @param {!Array.<!WebInspector.TimelinePresentationModel.Record>} presentationRecords
+     * @param {!WebInspector.TimelineModel.Record} record
      */
-    addRecord: function(record, presentationRecords) {},
+    addRecord: function(record) {},
 
     /**
-     * @param {?WebInspector.TimelinePresentationModel.Record} record
+     * @param {?WebInspector.TimelineModel.Record} record
      * @param {string=} regex
      * @param {boolean=} selectRecord
      */
     highlightSearchResult: function(record, regex, selectRecord) {},
 
     /**
      * @param {number} startTime
      * @param {number} endTime
      */
     setWindowTimes: function(startTime, endTime) {},
 
     /**
      * @param {number} width
      */
     setSidebarSize: function(width) {},
 
     /**
-     * @param {?WebInspector.TimelinePresentationModel.Record} record
+     * @param {?WebInspector.TimelineModel.Record} record
      */
     setSelectedRecord: function(record) {}
 }
 
 /**
  * @interface
  */
 WebInspector.TimelineModeViewDelegate = function() {}
 
 WebInspector.TimelineModeViewDelegate.prototype = {
     /**
      * @param {number} startTime
      * @param {number} endTime
      */
     requestWindowTimes: function(startTime, endTime) {},
 
     /**
-     * @param {?WebInspector.TimelinePresentationModel.Record} record
+     * @param {?WebInspector.TimelineModel.Record} record
      */
     selectRecord: function(record) {}
 }
 
 /**
  * @constructor
  * @implements {WebInspector.TimelinePresentationModel.Filter}
  */
 WebInspector.TimelineCategoryFilter = function()
 {
 }
 
 WebInspector.TimelineCategoryFilter.prototype = {
     /**
-     * @param {!WebInspector.TimelinePresentationModel.Record} record
+     * @param {!WebInspector.TimelineModel.Record} record
      * @return {boolean}
      */
     accept: function(record)
     {
         return !record.category.hidden;
     }
 }
 
 /**
  * @constructor
  * @implements {WebInspector.TimelinePresentationModel.Filter}
  */
 WebInspector.TimelineIsLongFilter = function()
 {
     this._minimumRecordDuration = 0;
 }
 
 WebInspector.TimelineIsLongFilter.prototype = {
     /**
      * @param {number} value
      */
     setMinimumRecordDuration: function(value)
     {
         this._minimumRecordDuration = value;
     },
 
     /**
-     * @param {!WebInspector.TimelinePresentationModel.Record} record
+     * @param {!WebInspector.TimelineModel.Record} record
      * @return {boolean}
      */
     accept: function(record)
     {
         return this._minimumRecordDuration ? ((record.lastChildEndTime - record.startTime) >= this._minimumRecordDuration) : true;
     }
 }
 
 /**
  * @param {!RegExp} regExp
  * @constructor
  * @implements {WebInspector.TimelinePresentationModel.Filter}
  */
 WebInspector.TimelineSearchFilter = function(regExp)
 {
     this._regExp = regExp;
 }
 
 WebInspector.TimelineSearchFilter.prototype = {
     /**
-     * @param {!WebInspector.TimelinePresentationModel.Record} record
+     * @param {!WebInspector.TimelineModel.Record} record
      * @return {boolean}
      */
     accept: function(record)
     {
         return record.testContentMatching(this._regExp);
     }
 }
 
 /**
  * @constructor
@@ skipping 11 matching lines @@
         this._windowEndTime = Infinity;
     },
 
     setWindowTimes: function(windowStartTime, windowEndTime)
     {
         this._windowStartTime = windowStartTime;
         this._windowEndTime = windowEndTime;
     },
 
     /**
-     * @param {!WebInspector.TimelinePresentationModel.Record} record
+     * @param {!WebInspector.TimelineModel.Record} record
      * @return {boolean}
      */
     accept: function(record)
     {
         return record.lastChildEndTime >= this._windowStartTime && record.startTime <= this._windowEndTime;
     }
 }