DevTools: merge TracingTimelineModel into 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 205 matching lines @@
 /**
  * @constructor
  * @extends {WebInspector.TimelineFrameModelBase}
  */
 WebInspector.TracingTimelineFrameModel = function()
 {
     WebInspector.TimelineFrameModelBase.call(this);
 }
 
 WebInspector.TracingTimelineFrameModel._mainFrameMarkers = [
-    WebInspector.TracingTimelineModel.RecordType.ScheduleStyleRecalculation,
-    WebInspector.TracingTimelineModel.RecordType.InvalidateLayout,
-    WebInspector.TracingTimelineModel.RecordType.BeginMainThreadFrame,
-    WebInspector.TracingTimelineModel.RecordType.ScrollLayer
+    WebInspector.TimelineModel.RecordType.ScheduleStyleRecalculation,
+    WebInspector.TimelineModel.RecordType.InvalidateLayout,
+    WebInspector.TimelineModel.RecordType.BeginMainThreadFrame,
+    WebInspector.TimelineModel.RecordType.ScrollLayer
 ];
 
 WebInspector.TracingTimelineFrameModel.prototype = {
     /**
      * @param {!Array.<!WebInspector.TracingModel.Event>} events
      * @param {string} sessionId
      */
     addTraceEvents: function(events, sessionId)
     {
         this._sessionId = sessionId;
         if (!events.length)
             return;
         if (events[0].startTime < this._minimumRecordTime)
             this._minimumRecordTime = events[0].startTime;
         for (var i = 0; i < events.length; ++i)
             this._addTraceEvent(events[i]);
     },
 
     /**
      * @param {!WebInspector.TracingModel.Event} event
      */
     _addTraceEvent: function(event)
     {
-        var eventNames = WebInspector.TracingTimelineModel.RecordType;
+        var eventNames = WebInspector.TimelineModel.RecordType;
 
         if (event.name === eventNames.SetLayerTreeId) {
             if (this._sessionId === event.args["sessionId"])
                 this._layerTreeId = event.args["layerTreeId"];
             return;
         }
         if (event.name === eventNames.TracingStartedInPage) {
             this._mainThread = event.thread;
             return;
         }
         if (event.thread === this._mainThread)
             this._addMainThreadTraceEvent(event);
         else
             this._addBackgroundTraceEvent(event);
     },
 
     /**
      * @param {!WebInspector.TracingModel.Event} event
      */
     _addBackgroundTraceEvent: function(event)
     {
-        var eventNames = WebInspector.TracingTimelineModel.RecordType;
+        var eventNames = WebInspector.TimelineModel.RecordType;
         if (event.phase === WebInspector.TracingModel.Phase.SnapshotObject && event.name === eventNames.LayerTreeHostImplSnapshot && parseInt(event.id, 0) === this._layerTreeId) {
             var snapshot = /** @type {!WebInspector.TracingModel.ObjectSnapshot} */ (event);
             this.handleLayerTreeSnapshot(new WebInspector.DeferredTracingLayerTree(snapshot));
             return;
         }
         if (this._lastFrame && event.selfTime)
             this._lastFrame._addTimeForCategory(WebInspector.TimelineUIUtils.eventStyle(event).category.name, event.selfTime);
 
         if (event.args["layerTreeId"] !== this._layerTreeId)
             return;
 
         var timestamp = event.startTime;
         if (event.name === eventNames.BeginFrame)
             this.handleBeginFrame(timestamp);
         else if (event.name === eventNames.DrawFrame)
             this.handleDrawFrame(timestamp);
         else if (event.name === eventNames.ActivateLayerTree)
             this.handleActivateLayerTree();
         else if (event.name === eventNames.RequestMainThreadFrame)
             this.handleRequestMainThreadFrame();
     },
 
     /**
      * @param {!WebInspector.TracingModel.Event} event
      */
     _addMainThreadTraceEvent: function(event)
     {
-        var eventNames = WebInspector.TracingTimelineModel.RecordType;
+        var eventNames = WebInspector.TimelineModel.RecordType;
         var timestamp = event.startTime;
         var selfTime = event.selfTime || 0;
 
         if (!this._hasThreadedCompositing) {
             if (event.name === eventNames.BeginMainThreadFrame)
                 this._startMainThreadFrame(timestamp);
             if (!this._lastFrame)
                 return;
             if (!selfTime)
                 return;
@@ skipping 205 matching lines @@
 /**
  * @constructor
  */
 WebInspector.PendingFrame = function()
 {
     /** @type {!Object.<string, number>} */
     this.timeByCategory = {};
     /** @type {!Array.<!WebInspector.LayerPaintEvent>} */
     this.paints = [];
 }