DevTools: merge TracingTimelineUIUtils into TimelineUIUtils

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 261 matching lines @@
      */
     _addBackgroundTraceEvent: function(event)
     {
         var eventNames = WebInspector.TracingTimelineModel.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.TracingTimelineUIUtils.eventStyle(event).category.name, 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)
@@ skipping 12 matching lines @@
         var selfTime = event.selfTime || 0;
 
         if (!this._hasThreadedCompositing) {
             if (event.name === eventNames.BeginMainThreadFrame)
                 this._startMainThreadFrame(timestamp);
             if (!this._lastFrame)
                 return;
             if (!selfTime)
                 return;
 
-            var categoryName = WebInspector.TracingTimelineUIUtils.eventStyle(event).category.name;
+            var categoryName = WebInspector.TimelineUIUtils.eventStyle(event).category.name;
             this._lastFrame._addTimeForCategory(categoryName, selfTime);
             return;
         }
 
         if (!this._framePendingCommit && WebInspector.TracingTimelineFrameModel._mainFrameMarkers.indexOf(event.name) >= 0)
             this._framePendingCommit = new WebInspector.PendingFrame();
         if (!this._framePendingCommit)
             return;
         if (event.name === eventNames.Paint && event.args["data"]["layerId"] && event.picture)
             this._framePendingCommit.paints.push(new WebInspector.LayerPaintEvent(event));
 
         if (selfTime) {
-            var categoryName = WebInspector.TracingTimelineUIUtils.eventStyle(event).category.name;
+            var categoryName = WebInspector.TimelineUIUtils.eventStyle(event).category.name;
             this._framePendingCommit.timeByCategory[categoryName] = (this._framePendingCommit.timeByCategory[categoryName] || 0) + selfTime;
         }
         if (event.name === eventNames.CompositeLayers && event.args["layerTreeId"] === this._layerTreeId)
             this.handleCompositeLayers();
     },
 
     __proto__: WebInspector.TimelineFrameModelBase.prototype
 }
 
 /**
@@ skipping 180 matching lines @@
 /**
  * @constructor
  */
 WebInspector.PendingFrame = function()
 {
     /** @type {!Object.<string, number>} */
     this.timeByCategory = {};
     /** @type {!Array.<!WebInspector.LayerPaintEvent>} */
     this.paints = [];
 }