Timeline: decouple TimelineFrameModel from TimelineModel

Source/devtools/front_end/timeline/TimelineFrameModel.js

 /*
  * Copyright (C) 2013 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 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
  * @constructor
- * @extends {WebInspector.Object}
- * @param {!WebInspector.TimelineModel} model
+ * @extends {WebInspector.TargetAwareObject}
+ * @param {!WebInspector.Target} target
  */
-WebInspector.TimelineFrameModel = function(model)
+WebInspector.TimelineFrameModel = function(target)
 {
-    this._model = model;
+    WebInspector.TargetAwareObject.call(this, target);
 
     this.reset();
-    var records = model.records();
-    for (var i = 0; i < records.length; ++i)
-        this.addRecord(records[i]);
 }
 
 WebInspector.TimelineFrameModel.Events = {
     FrameAdded: "FrameAdded"
 }
 
 WebInspector.TimelineFrameModel._mainFrameMarkers = [
     WebInspector.TimelineModel.RecordType.ScheduleStyleRecalculation,
     WebInspector.TimelineModel.RecordType.InvalidateLayout,
     WebInspector.TimelineModel.RecordType.BeginFrame,
     WebInspector.TimelineModel.RecordType.ScrollLayer
 ];
 
 WebInspector.TimelineFrameModel.prototype = {
     /**
-     * @return {!WebInspector.Target}
-     */
-    target: function()
-    {
-        return this._model.target();
-    },
-
-    /**
      * @return {!Array.<!WebInspector.TimelineFrame>}
      */
     frames: function()
     {
         return this._frames;
     },
 
     /**
      * @param {number} startTime
      * @param {number} endTime
@@ skipping 18 matching lines @@
         function compareEndTime(value, object)
         {
             return value - object.endTime;
         }
         var frames = this._frames;
         var firstFrame = insertionIndexForObjectInListSortedByFunction(startTime, frames, compareEndTime);
         var lastFrame = insertionIndexForObjectInListSortedByFunction(endTime, frames, compareStartTime);
         return frames.slice(firstFrame, lastFrame);
     },
 
+    /**
+     * @param {boolean} value
+     */
+    setMergeRecords: function(value)
+    {
+        this._mergeRecords = value;
+    },
+
     reset: function()
     {
+        this._mergeRecords = true;
+        this._minimumRecordTime = Infinity;
         this._frames = [];
         this._lastFrame = null;
         this._lastLayerTree = null;
         this._hasThreadedCompositing = false;
         this._mainFrameCommitted = false;
         this._mainFrameRequested = false;
         this._aggregatedMainThreadWork = null;
         this._mergingBuffer = new WebInspector.TimelineMergingRecordBuffer();
     },
 
     /**
+     * @param {!Array.<!WebInspector.TimelineModel.Record>} records
+     */
+    addRecords: function(records)
+    {
+        if (!records.length)
+            return;
+        if (records[0].startTime() < this._minimumRecordTime)
+            this._minimumRecordTime = records[0].startTime();
+        for (var i = 0; i < records.length; ++i)
+            this.addRecord(records[i]);
+    },
+
+    /**
      * @param {!WebInspector.TimelineModel.Record} record
      */
     addRecord: function(record)
     {
         var recordTypes = WebInspector.TimelineModel.RecordType;
         var programRecord = record.type() === recordTypes.Program ? record : null;
 
         // Start collecting main frame
         if (programRecord) {
             if (!this._aggregatedMainThreadWork && this._findRecordRecursively(WebInspector.TimelineFrameModel._mainFrameMarkers, programRecord))
                 this._aggregatedMainThreadWork = {};
         }
         /** type {Array.<!WebInspector.TimelineModel.Record>} */
         var records = [];
-        if (this._model.bufferEvents())
+        if (!this._mergeRecords)
             records = [record];
         else
             records = this._mergingBuffer.process(record.thread(), /** type {Array.<!WebInspector.TimelineModel.Record>} */(programRecord ? record.children() || [] : [record]));
         for (var i = 0; i < records.length; ++i) {
             if (records[i].thread())
                 this._addBackgroundRecord(records[i]);
             else
                 this._addMainThreadRecord(programRecord, records[i]);
         }
     },
@@ skipping 178 matching lines @@
      */
     _startBackgroundFrame: function(startTime)
     {
         if (!this._hasThreadedCompositing) {
             this._lastFrame = null;
             this._hasThreadedCompositing = true;
         }
         if (this._lastFrame)
             this._flushFrame(this._lastFrame, startTime);
 
-        this._lastFrame = new WebInspector.TimelineFrame(startTime, startTime - this._model.minimumRecordTime());
+        this._lastFrame = new WebInspector.TimelineFrame(startTime, startTime - this._minimumRecordTime);
     },
 
     /**
      * @param {number} startTime
      */
     _startMainThreadFrame: function(startTime)
     {
         if (this._lastFrame)
             this._flushFrame(this._lastFrame, startTime);
-        this._lastFrame = new WebInspector.TimelineFrame(startTime, startTime - this._model.minimumRecordTime());
+        this._lastFrame = new WebInspector.TimelineFrame(startTime, startTime - this._minimumRecordTime);
     },
 
     /**
      * @param {!WebInspector.TimelineFrame} frame
      * @param {number} endTime
      */
     _flushFrame: function(frame, endTime)
     {
         frame._setLayerTree(this._lastLayerTree);
         frame._setEndTime(endTime);
@@ skipping 13 matching lines @@
         if (!record.children())
             return null;
         for (var i = 0; i < record.children().length; ++i) {
             var result = this._findRecordRecursively(types, record.children()[i]);
             if (result)
                 return result;
         }
         return null;
     },
 
-    __proto__: WebInspector.Object.prototype
+    __proto__: WebInspector.TargetAwareObject.prototype
 }
 
 /**
  * @constructor
  * @param {!Array.<!WebInspector.TimelineFrame>} frames
  */
 WebInspector.FrameStatistics = function(frames)
 {
     this.frameCount = frames.length;
     this.minDuration = Infinity;
@@ skipping 73 matching lines @@
         this._updateCpuTime();
     },
 
     _updateCpuTime: function()
     {
         this.cpuTime = 0;
         for (var key in this.timeByCategory)
             this.cpuTime += this.timeByCategory[key];
     }
 }