DevTools: merge TracingTimelineUIUtils into TimelineUIUtils

Source/devtools/front_end/timeline/TimelineView.js

 /*
  * Copyright (C) 2013 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 17 matching lines @@
  * (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.HBox}
  * @implements {WebInspector.TimelineModeView}
  * @param {!WebInspector.TimelineModeViewDelegate} delegate
  * @param {!WebInspector.TimelineModel} model
- * @param {!WebInspector.TimelineUIUtils} uiUtils
  */
-WebInspector.TimelineView = function(delegate, model, uiUtils)
+WebInspector.TimelineView = function(delegate, model)
 {
     WebInspector.HBox.call(this);
     this.element.classList.add("timeline-view");
 
     this._delegate = delegate;
     this._model = model;
-    this._uiUtils = uiUtils;
-    this._presentationModel = new WebInspector.TimelinePresentationModel(model, uiUtils);
+    this._presentationModel = new WebInspector.TimelinePresentationModel(model);
     this._calculator = new WebInspector.TimelineCalculator(model);
     this._linkifier = new WebInspector.Linkifier();
     this._frameStripByFrame = new Map();
 
     this._boundariesAreValid = true;
     this._scrollTop = 0;
 
     this._recordsView = this._createRecordsView();
     this._recordsView.addEventListener(WebInspector.SplitView.Events.SidebarSizeChanged, this._sidebarResized, this);
     this._recordsView.show(this.element);
@@ skipping 69 matching lines @@
         var clientWidth = this._graphRowsElementWidth;
         var dividers = [];
         var eventDividerRecords = this._model.eventDividerRecords();
 
         for (var i = 0; i < eventDividerRecords.length; ++i) {
             var record = eventDividerRecords[i];
             var position = this._calculator.computePosition(record.startTime());
             var dividerPosition = Math.round(position);
             if (dividerPosition < 0 || dividerPosition >= clientWidth || dividers[dividerPosition])
                 continue;
-            var title = this._uiUtils.titleForRecord(record);
-            var divider = this._uiUtils.createEventDivider(record.type(), title);
+            var title = WebInspector.TimelineUIUtils.titleForRecord(record);
+            var divider = WebInspector.TimelineUIUtils.createEventDivider(record.type(), title);
             divider.style.left = dividerPosition + "px";
             dividers[dividerPosition] = divider;
         }
         this._timelineGrid.addEventDividers(dividers);
     },
 
     _updateFrameBars: function(frames)
     {
         var clientWidth = this._graphRowsElementWidth;
         if (this._frameContainer) {
@@ skipping 22 matching lines @@
             frameStrip._frame = frame;
             this._frameStripByFrame.set(frame, frameStrip);
 
             const minWidthForFrameInfo = 60;
             if (width > minWidthForFrameInfo)
                 frameStrip.textContent = Number.millisToString(frame.endTime - frame.startTime, true);
 
             this._frameContainer.appendChild(frameStrip);
 
             if (actualStart > 0) {
-                var frameMarker = this._uiUtils.createBeginFrameDivider();
+                var frameMarker = WebInspector.TimelineUIUtils.createEventDivider(WebInspector.TracingTimelineModel.RecordType.BeginFrame);
                 frameMarker.style.left = frameStart + "px";
                 dividers.push(frameMarker);
             }
         }
         this._timelineGrid.addEventDividers(dividers);
         this._headerElement.appendChild(this._frameContainer);
     },
 
     _onFrameDoubleClicked: function(event)
     {
@@ skipping 133 matching lines @@
      * @param {?WebInspector.TimelinePresentationModel.Record} presentationRecord
      */
     _selectRecord: function(presentationRecord)
     {
         if (presentationRecord.coalesced()) {
             // Presentation record does not have model record to highlight.
             this._innerSetSelectedRecord(presentationRecord);
             var aggregatedStats = {};
             var presentationChildren = presentationRecord.presentationChildren();
             for (var i = 0; i < presentationChildren.length; ++i)
-                this._uiUtils.aggregateTimeForRecord(aggregatedStats, presentationChildren[i].record());
+                WebInspector.TimelineUIUtils.aggregateTimeForRecord(aggregatedStats, presentationChildren[i].record());
             var idle = presentationRecord.endTime() - presentationRecord.startTime();
             for (var category in aggregatedStats)
                 idle -= aggregatedStats[category];
             aggregatedStats["idle"] = idle;
 
             var contentHelper = new WebInspector.TimelineDetailsContentHelper(null, null, true);
             var pieChart = WebInspector.TimelineUIUtils.generatePieChart(aggregatedStats);
-            var title = this._uiUtils.titleForRecord(presentationRecord.record());
+            var title = WebInspector.TimelineUIUtils.titleForRecord(presentationRecord.record());
             contentHelper.appendTextRow(WebInspector.UIString("Type"), title);
             contentHelper.appendElementRow(WebInspector.UIString("Aggregated Time"), pieChart);
             this._delegate.showInDetails(contentHelper.element);
             return;
         }
         this._delegate.select(WebInspector.TimelineSelection.fromRecord(presentationRecord.record()));
     },
 
     /**
      * @param {?WebInspector.TimelineSelection} selection
@@ skipping 215 matching lines @@
             } else {
                 if (!listRowElement) {
                     listRowElement = new WebInspector.TimelineRecordListRow(this._linkifier, selectRecordCallback, scheduleRefreshCallback).element;
                     this._sidebarListElement.appendChild(listRowElement);
                 }
                 if (!graphRowElement) {
                     graphRowElement = new WebInspector.TimelineRecordGraphRow(this._itemsGraphsElement, selectRecordCallback, scheduleRefreshCallback).element;
                     this._graphRowsElement.appendChild(graphRowElement);
                 }
 
-                listRowElement.row.update(record, visibleTop, this._uiUtils);
-                graphRowElement.row.update(record, this._calculator, this._expandOffset, i, this._uiUtils);
+                listRowElement.row.update(record, visibleTop);
+                graphRowElement.row.update(record, this._calculator, this._expandOffset, i);
                 if (this._lastSelectedRecord === record) {
                     listRowElement.row.renderAsSelected(true);
                     graphRowElement.row.renderAsSelected(true);
                 }
 
                 listRowElement = listRowElement.nextSibling;
                 graphRowElement = graphRowElement.nextSibling;
             }
         }
 
@@ skipping 234 matching lines @@
     {
         if (!rowElement || !rowElement.row)
             return false;
         var presentationRecord = rowElement.row._record;
         if (presentationRecord.coalesced())
             return false;
         var record = presentationRecord.record();
         if (this._highlightedQuadRecord === record)
             return true;
 
-        var quad = this._uiUtils.highlightQuadForRecord(record);
+        var quad = record.traceEvent().highlightQuad;
         var target = record.target();
         if (!quad || !target)
             return false;
         this._highlightedQuadRecord = record;
         target.domAgent().highlightQuad(quad, WebInspector.Color.PageHighlight.Content.toProtocolRGBA(), WebInspector.Color.PageHighlight.ContentOutline.toProtocolRGBA());
         return true;
     },
 
     _hideQuadHighlight: function()
     {
@@ skipping 196 matching lines @@
 
     this._dataElement = this.element.createChild("span", "data dimmed");
     this._scheduleRefresh = scheduleRefresh;
     this._selectRecord = selectRecord;
 }
 
 WebInspector.TimelineRecordListRow.prototype = {
     /**
      * @param {!WebInspector.TimelinePresentationModel.Record} presentationRecord
      * @param {number} offset
-     * @param {!WebInspector.TimelineUIUtils} uiUtils
      */
-    update: function(presentationRecord, offset, uiUtils)
+    update: function(presentationRecord, offset)
     {
         this._record = presentationRecord;
         var record = presentationRecord.record();
         this._offset = offset;
 
-        this.element.className = "timeline-tree-item timeline-category-" + uiUtils.categoryForRecord(record).name;
+        this.element.className = "timeline-tree-item timeline-category-" + WebInspector.TimelineUIUtils.categoryForRecord(record).name;
         var paddingLeft = 5;
         var step = -3;
         for (var currentRecord = presentationRecord.presentationParent() ? presentationRecord.presentationParent().presentationParent() : null; currentRecord; currentRecord = currentRecord.presentationParent())
             paddingLeft += 12 / (Math.max(1, step++));
         this.element.style.paddingLeft = paddingLeft + "px";
         if (record.thread() !== WebInspector.TimelineModel.MainThreadName)
             this.element.classList.add("background");
 
-        this._typeElement.textContent = uiUtils.titleForRecord(record);
+        this._typeElement.textContent = WebInspector.TimelineUIUtils.titleForRecord(record);
 
         if (this._dataElement.firstChild)
             this._dataElement.removeChildren();
 
         this._warningElement.classList.toggle("hidden", !presentationRecord.hasWarnings() && !presentationRecord.childHasWarnings());
         this._warningElement.classList.toggle("timeline-tree-item-child-warning", presentationRecord.childHasWarnings() && !presentationRecord.hasWarnings());
 
         if (presentationRecord.coalesced()) {
             this._dataElement.createTextChild(WebInspector.UIString("× %d", presentationRecord.presentationChildren().length));
         } else {
-            var detailsNode = uiUtils.buildDetailsNode(record, this._linkifier);
+            var detailsNode = WebInspector.TimelineUIUtils.buildDetailsNodeForTraceEvent(record.traceEvent(), this._linkifier);
             if (detailsNode) {
                 this._dataElement.createTextChild("(");
                 this._dataElement.appendChild(detailsNode);
                 this._dataElement.createTextChild(")");
             }
         }
 
         this._expandArrowElement.classList.toggle("parent", presentationRecord.expandable());
         this._expandArrowElement.classList.toggle("expanded", !!presentationRecord.visibleChildrenCount());
         this._record.setListRow(this);
@@ skipping 85 matching lines @@
     this._selectRecord = selectRecord;
     this._scheduleRefresh = scheduleRefresh;
 }
 
 WebInspector.TimelineRecordGraphRow.prototype = {
     /**
      * @param {!WebInspector.TimelinePresentationModel.Record} presentationRecord
      * @param {!WebInspector.TimelineCalculator} calculator
      * @param {number} expandOffset
      * @param {number} index
-     * @param {!WebInspector.TimelineUIUtils} uiUtils
      */
-    update: function(presentationRecord, calculator, expandOffset, index, uiUtils)
+    update: function(presentationRecord, calculator, expandOffset, index)
     {
         this._record = presentationRecord;
         var record = presentationRecord.record();
-        this.element.className = "timeline-graph-side timeline-category-" + uiUtils.categoryForRecord(record).name;
+        this.element.className = "timeline-graph-side timeline-category-" + WebInspector.TimelineUIUtils.categoryForRecord(record).name;
         if (record.thread() !== WebInspector.TimelineModel.MainThreadName)
             this.element.classList.add("background");
 
         var barPosition = calculator.computeBarGraphWindowPosition(presentationRecord);
         this._barElement.style.left = barPosition.left + "px";
         this._barElement.style.width = barPosition.width + "px";
         this._barCpuElement.style.left = barPosition.left + "px";
         this._barCpuElement.style.width = barPosition.cpuWidth + "px";
         this._expandElement._update(presentationRecord, index, barPosition.left - expandOffset, barPosition.width);
         this._record.setGraphRow(this);
@@ skipping 88 matching lines @@
         } else {
             this._element.classList.add("hidden");
         }
     },
 
     _dispose: function()
     {
         this._element.remove();
     }
 }