DevTools: Remove redundant dependency on target from TimelineFrameModel

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.SDKObject}
- * @param {!WebInspector.Target} target
  */
-WebInspector.TimelineFrameModelBase = function(target)
+WebInspector.TimelineFrameModelBase = function()
 {
-    WebInspector.SDKObject.call(this, target);
-
     this.reset();
 }
 
 WebInspector.TimelineFrameModelBase.prototype = {
     /**
      * @return {!Array.<!WebInspector.TimelineFrame>}
      */
     frames: function()
     {
         return this._frames;
@@ skipping 150 matching lines @@
         if (types.indexOf(record.type()) >= 0)
             return record;
         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.SDKObject.prototype
+    }
 }
 
 /**
  * @constructor
- * @param {!WebInspector.Target} target
  * @extends {WebInspector.TimelineFrameModelBase}
  */
-WebInspector.TimelineFrameModel = function(target)
+WebInspector.TimelineFrameModel = function()
 {
-    WebInspector.TimelineFrameModelBase.call(this, target);
+    WebInspector.TimelineFrameModelBase.call(this);
 }
 
 WebInspector.TimelineFrameModel._mainFrameMarkers = [
     WebInspector.TimelineModel.RecordType.ScheduleStyleRecalculation,
     WebInspector.TimelineModel.RecordType.InvalidateLayout,
     WebInspector.TimelineModel.RecordType.BeginFrame,
     WebInspector.TimelineModel.RecordType.ScrollLayer
 ];
 
 WebInspector.TimelineFrameModel.prototype = {
@@ skipping 72 matching lines @@
     },
 
     /**
      * @param {?WebInspector.TimelineModel.Record} programRecord
      * @param {!WebInspector.TimelineModel.Record} record
      */
     _addMainThreadRecord: function(programRecord, record)
     {
         var recordTypes = WebInspector.TimelineModel.RecordType;
         if (record.type() === recordTypes.UpdateLayerTree && record.data()["layerTree"])
-            this.handleLayerTreeSnapshot(new WebInspector.DeferredAgentLayerTree(this.target().weakReference(), record.data()["layerTree"]));
+            this.handleLayerTreeSnapshot(new WebInspector.DeferredAgentLayerTree(record.target().weakReference(), record.data()["layerTree"]));
         if (!this._hasThreadedCompositing) {
             if (record.type() === recordTypes.BeginFrame)
                 this._startMainThreadFrame(record.startTime());
 
             if (!this._lastFrame)
                 return;
 
             this._lastFrame._addTimeFromRecord(record);
 
             // Account for "other" time at the same time as the first child.
@@ skipping 23 matching lines @@
         for (var i = 0; i < programRecord.children().length; ++i)
             accounted += programRecord.children()[i].endTime() - programRecord.children()[i].startTime();
         return programRecord.endTime() - programRecord.startTime() - accounted;
     },
 
     __proto__: WebInspector.TimelineFrameModelBase.prototype,
 };
 
 /**
  * @constructor
- * @param {!WebInspector.Target} target
  * @extends {WebInspector.TimelineFrameModelBase}
  */
-WebInspector.TracingTimelineFrameModel = function(target)
+WebInspector.TracingTimelineFrameModel = function()
 {
-    WebInspector.TimelineFrameModelBase.call(this, target);
+    WebInspector.TimelineFrameModelBase.call(this);
 }
 
 WebInspector.TracingTimelineFrameModel._mainFrameMarkers = [
     WebInspector.TracingTimelineModel.RecordType.ScheduleStyleRecalculation,
     WebInspector.TracingTimelineModel.RecordType.InvalidateLayout,
     WebInspector.TracingTimelineModel.RecordType.BeginMainThreadFrame,
     WebInspector.TracingTimelineModel.RecordType.ScrollLayer
 ];
 
 WebInspector.TracingTimelineFrameModel.prototype = {
@@ skipping 33 matching lines @@
         else
             this._addBackgroundTraceEvent(event);
     },
 
     /**
      * @param {!WebInspector.TracingModel.Event} event
      */
     _addBackgroundTraceEvent: function(event)
     {
         var eventNames = WebInspector.TracingTimelineModel.RecordType;
-
+        var target = event.thread.target();
         if (event.phase === WebInspector.TracingModel.Phase.SnapshotObject && event.name === eventNames.LayerTreeHostImplSnapshot && parseInt(event.id, 0) === this._layerTreeId) {
-            this.handleLayerTreeSnapshot(new WebInspector.DeferredTracingLayerTree(this.target().weakReference(), event.args["snapshot"]["active_tree"]["root_layer"], event.args["snapshot"]["device_viewport_size"]));
+            this.handleLayerTreeSnapshot(new WebInspector.DeferredTracingLayerTree(target ? target.weakReference() : new WeakReference(null), event.args["snapshot"]["active_tree"]["root_layer"], event.args["snapshot"]["device_viewport_size"]));

[caseq, 2014/07/17 12:30:36]

new WeakReference(null) looks rather unfortunate. Can we change
DeferredTracingLayerTree and co. to accept bare nullable target references
instead?

[sergeyv, 2014/07/17 14:34:29]

Done.

             return;
         }
         if (this._lastFrame && event.selfTime)
             this._lastFrame._addTimeForCategory(WebInspector.TracingTimelineUIUtils.eventStyle(event).category.name, event.selfTime);
 
         if (event.args["layerTreeId"] !== this._layerTreeId)
             return;
 
         var timestamp = event.startTime;
         if (event.name === eventNames.BeginFrame)
@@ skipping 164 matching lines @@
 /**
  * @constructor
  */
 WebInspector.PendingFrame = function()
 {
     /** @type {!Object.<string, number>} */
     this.timeByCategory = {};
     /** @type {!Array.<!WebInspector.LayerPaintEvent>} */
     this.paints = [];
 }