Timeline: split frame model into trace-specific and record-specific parts

Source/devtools/front_end/timeline/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 231 matching lines @@
     /**
      * @param {number} windowStartTime
      * @param {number} windowEndTime
      */
     requestWindowTimes: function(windowStartTime, windowEndTime)
     {
         this._overviewPane.requestWindowTimes(windowStartTime, windowEndTime);
     },
 
     /**
-     * @return {!WebInspector.TimelineFrameModel}
+     * @return {!WebInspector.TimelineFrameModelBase}
      */
     _frameModel: function()
     {
-        if (!this._lazyFrameModel) {
-            this._lazyFrameModel = new WebInspector.TimelineFrameModel(this._model.target());
-            this._lazyFrameModel.setMergeRecords(!WebInspector.experimentsSettings.timelineNoLiveUpdate.isEnabled() || !this._recordingInProgress);
-            this._lazyFrameModel.addRecords(this._model.records());
-            if (this._tracingModel)
-                this._lazyFrameModel.addTraceEvents(this._tracingTimelineModel.inspectedTargetEvents(), this._tracingModel.sessionId() || "");
+        if (this._lazyFrameModel)
+            return this._lazyFrameModel;
+        if (this._tracingModel) {
+            var tracingFrameModel = new WebInspector.TracingTimelineFrameModel(this._model.target());
+            tracingFrameModel.addTraceEvents(this._tracingTimelineModel.inspectedTargetEvents(), this._tracingModel.sessionId() || "");
+            this._lazyFrameModel = tracingFrameModel;
+        } else {
+            var frameModel = new WebInspector.TimelineFrameModel(this._model.target());
+            frameModel.setMergeRecords(!WebInspector.experimentsSettings.timelineNoLiveUpdate.isEnabled() || !this._recordingInProgress);
+            frameModel.addRecords(this._model.records());
+            this._lazyFrameModel = frameModel;
         }
         return this._lazyFrameModel;
     },
 
     /**
      * @return {!WebInspector.TimelineView}
      */
     _timelineView: function()
     {
         if (!this._lazyTimelineView)
@@ skipping 530 matching lines @@
     _onRecordAdded: function(event)
     {
         this._addRecord(/** @type {!WebInspector.TimelineModel.Record} */(event.data));
     },
 
     /**
      * @param {!WebInspector.TimelineModel.Record} record
      */
     _addRecord: function(record)
     {
-        if (this._lazyFrameModel)
+        if (this._lazyFrameModel && !this._tracingModel)
             this._lazyFrameModel.addRecord(record);
         for (var i = 0; i < this._currentViews.length; ++i)
             this._currentViews[i].addRecord(record);
         this._overviewPane.addRecord(record);
         this._updateSearchHighlight(false, true);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
@@ skipping 595 matching lines @@
      * @param {!WebInspector.TimelineModel.Record} record
      * @return {boolean}
      */
     accept: function(record)
     {
         return !this._hiddenRecords[record.type()];
     },
 
     __proto__: WebInspector.TimelineModel.Filter.prototype
 }