DevTools: merge TracingTimelineUIUtils into TimelineUIUtils

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 33 matching lines @@
 
     this._detailsLinkifier = new WebInspector.Linkifier();
     this._windowStartTime = 0;
     this._windowEndTime = Infinity;
 
     // Create model.
     this._tracingManager = new WebInspector.TracingManager();
     this._tracingManager.addEventListener(WebInspector.TracingManager.Events.BufferUsage, this._onTracingBufferUsage, this);
 
     this._tracingModel = new WebInspector.TracingModel();
-    this._uiUtils = new WebInspector.TracingTimelineUIUtils();
-    this._tracingTimelineModel = new WebInspector.TracingTimelineModel(this._tracingManager, this._tracingModel, this._uiUtils.hiddenRecordsFilter());
+    this._tracingTimelineModel = new WebInspector.TracingTimelineModel(this._tracingManager, this._tracingModel, WebInspector.TimelineUIUtils.hiddenRecordsFilter());
     this._model = this._tracingTimelineModel;
 
     this._model.addEventListener(WebInspector.TimelineModel.Events.RecordingStarted, this._onRecordingStarted, this);
     this._model.addEventListener(WebInspector.TimelineModel.Events.RecordingStopped, this._onRecordingStopped, this);
     this._model.addEventListener(WebInspector.TimelineModel.Events.RecordsCleared, this._onRecordsCleared, this);
     this._model.addEventListener(WebInspector.TimelineModel.Events.RecordFilterChanged, this._refreshViews, this);
 
-    this._categoryFilter = new WebInspector.TimelineCategoryFilter(this._uiUtils);
+    this._categoryFilter = new WebInspector.TimelineCategoryFilter();
     this._durationFilter = new WebInspector.TimelineIsLongFilter();
-    this._textFilter = new WebInspector.TimelineTextFilter(this._uiUtils);
+    this._textFilter = new WebInspector.TimelineTextFilter();
 
-    var hiddenEmptyRecordsFilter = this._uiUtils.hiddenEmptyRecordsFilter();
-    if (hiddenEmptyRecordsFilter)
-        this._model.addFilter(hiddenEmptyRecordsFilter);
-    this._model.addFilter(this._uiUtils.hiddenRecordsFilter());
+    this._model.addFilter(new WebInspector.TimelineRecordHiddenEmptyTypeFilter([WebInspector.TimelineModel.RecordType.EventDispatch]));
+    this._model.addFilter(WebInspector.TimelineUIUtils.hiddenRecordsFilter());
     this._model.addFilter(this._categoryFilter);
     this._model.addFilter(this._durationFilter);
     this._model.addFilter(this._textFilter);
 
     /** @type {!Array.<!WebInspector.TimelineModeView>} */
     this._currentViews = [];
 
     this._overviewModeSetting = WebInspector.settings.createSetting("timelineOverviewMode", WebInspector.TimelinePanel.OverviewMode.Frames);
     this._flameChartEnabledSetting = WebInspector.settings.createSetting("timelineFlameChartEnabled", true);
     this._createStatusBarItems();
 
     var topPaneElement = this.element.createChild("div", "hbox");
     topPaneElement.id = "timeline-overview-panel";
 
     // Create top overview component.
-    this._overviewPane = new WebInspector.TimelineOverviewPane(this._model, this._uiUtils);
+    this._overviewPane = new WebInspector.TimelineOverviewPane(this._model);
     this._overviewPane.addEventListener(WebInspector.TimelineOverviewPane.Events.WindowChanged, this._onWindowChanged.bind(this));
     this._overviewPane.show(topPaneElement);
 
     this._createFileSelector();
     this._registerShortcuts();
 
     WebInspector.targetManager.addEventListener(WebInspector.TargetManager.Events.WillReloadPage, this._willReloadPage, this);
     WebInspector.targetManager.addEventListener(WebInspector.TargetManager.Events.Load, this._loadEventFired, this);
 
     // Create top level properties splitter.
@@ skipping 136 matching lines @@
         }
         return this._lazyFrameModel;
     },
 
     /**
      * @return {!WebInspector.TimelineView}
      */
     _timelineView: function()
     {
         if (!this._lazyTimelineView)
-            this._lazyTimelineView = new WebInspector.TimelineView(this, this._model, this._uiUtils);
+            this._lazyTimelineView = new WebInspector.TimelineView(this, this._model);
         return this._lazyTimelineView;
     },
 
     /**
      * @return {!WebInspector.View}
      */
     _layersView: function()
     {
         if (this._lazyLayersView)
             return this._lazyLayersView;
@@ skipping 327 matching lines @@
     {
         this._stackView.detach();
 
         var isFrameMode = this._overviewModeSetting.get() === WebInspector.TimelinePanel.OverviewMode.Frames;
         this._removeAllModeViews();
         this._overviewControls = [];
 
         if (isFrameMode)
             this._overviewControls.push(new WebInspector.TimelineFrameOverview(this._model, this._frameModel()));
         else
-            this._overviewControls.push(new WebInspector.TimelineEventOverview(this._model, this._uiUtils));
+            this._overviewControls.push(new WebInspector.TimelineEventOverview(this._model));
 
         if (this._flameChartEnabledSetting.get()) {
             this._filterBar.filterButton().setEnabled(false);
             this._filtersContainer.classList.toggle("hidden", true);
             this._addModeView(new WebInspector.TimelineFlameChart(this, this._tracingTimelineModel, this._frameModel()));
         } else {
             this._filterBar.filterButton().setEnabled(true);
             this._filtersContainer.classList.toggle("hidden", !this._filterBar.filtersToggled());
             this._addModeView(this._timelineView());
         }
 
         if (this._captureMemorySetting.get()) {
             if (!isFrameMode)  // Frame mode skews time, don't render aux overviews.
-                this._overviewControls.push(new WebInspector.TimelineMemoryOverview(this._model, this._uiUtils));
-            this._addModeView(new WebInspector.MemoryCountersGraph(this, this._model, this._uiUtils));
+                this._overviewControls.push(new WebInspector.TimelineMemoryOverview(this._model));
+            this._addModeView(new WebInspector.MemoryCountersGraph(this, this._model));
         }
 
         if (this._capturePowerSetting && this._capturePowerSetting.get() &&
             WebInspector.targetManager.mainTarget().hasCapability(WebInspector.Target.Capabilities.CanProfilePower)) {
             if (!isFrameMode)  // Frame mode skews time, don't render aux overviews.
                 this._overviewControls.push(new WebInspector.TimelinePowerOverview(this._model));
             this._addModeView(new WebInspector.TimelinePowerGraph(this, this._model));
         }
 
         if (this._lazyTimelineView)
@@ skipping 287 matching lines @@
 
         /**
          * @param {!WebInspector.TimelineModel.Record} record
          * @this {WebInspector.TimelinePanel}
          */
         function processRecord(record)
         {
             if (record.endTime() < this._windowStartTime ||
                 record.startTime() > this._windowEndTime)
                 return;
-            if (this._uiUtils.testContentMatching(record, searchRegExp))
+            if (WebInspector.TimelineUIUtils.testContentMatching(record, searchRegExp))
                 matches.push(record);
         }
         this._model.forAllFilteredRecords(processRecord.bind(this));
 
         var matchesCount = matches.length;
         if (matchesCount) {
             this._searchResults = matches;
             this._searchableView.updateSearchMatchesCount(matchesCount);
 
             var selectedIndex = matches.indexOf(this._selectedSearchResult);
@@ skipping 29 matching lines @@
 
     _updateSelectionDetails: function()
     {
         if (!this._selection)
             this._selection = WebInspector.TimelineSelection.fromRange(this._windowStartTime, this._windowEndTime);
 
         switch (this._selection.type()) {
         case WebInspector.TimelineSelection.Type.Record:
             var record = /** @type {!WebInspector.TimelineModel.Record} */ (this._selection.object());
             var event = record.traceEvent();
-            this._uiUtils.generateDetailsContent(record, this._model, this._detailsLinkifier, this._appendDetailsTabsForTraceEventAndShowDetails.bind(this, event));
+            WebInspector.TimelineUIUtils.buildTraceEventDetails(event, this._tracingTimelineModel, this._detailsLinkifier, this._appendDetailsTabsForTraceEventAndShowDetails.bind(this, event));
             break;
         case WebInspector.TimelineSelection.Type.TraceEvent:
             var event = /** @type {!WebInspector.TracingModel.Event} */ (this._selection.object());
-            WebInspector.TracingTimelineUIUtils.buildTraceEventDetails(event, this._tracingTimelineModel, this._detailsLinkifier, this._appendDetailsTabsForTraceEventAndShowDetails.bind(this, event));
+            WebInspector.TimelineUIUtils.buildTraceEventDetails(event, this._tracingTimelineModel, this._detailsLinkifier, this._appendDetailsTabsForTraceEventAndShowDetails.bind(this, event));
             break;
         case WebInspector.TimelineSelection.Type.Frame:
             var frame = /** @type {!WebInspector.TimelineFrame} */ (this._selection.object());
             this.showInDetails(WebInspector.TimelineUIUtils.generateDetailsContentForFrame(this._lazyFrameModel, frame));
             if (frame.layerTree) {
                 var layersView = this._layersView();
                 layersView.showLayerTree(frame.layerTree, frame.paints);
                 this._detailsView.appendTab(WebInspector.TimelinePanel.DetailsTab.LayerViewer, WebInspector.UIString("Layers"), layersView);
             }
             break;
@@ skipping 33 matching lines @@
             paintProfilerView.setPicture(event.thread.target(), result["skp64"]);
         }
     },
 
     /**
      * @param {number} startTime
      * @param {number} endTime
      */
     _updateSelectedRangeStats: function(startTime, endTime)
     {
-        var uiUtils = this._uiUtils;
-
         // Return early in case 0 selection window.
         if (startTime < 0)
             return;
 
         var aggregatedStats = {};
 
         /**
          * @param {number} value
          * @param {!WebInspector.TimelineModel.Record} task
          * @return {number}
@@ skipping 13 matching lines @@
 
             var childrenTime = 0;
             var children = record.children() || [];
             for (var i = 0; i < children.length; ++i) {
                 var child = children[i];
                 if (!child.endTime() || child.endTime() < startTime || child.startTime() > endTime)
                     continue;
                 childrenTime += Math.min(endTime, child.endTime()) - Math.max(startTime, child.startTime());
                 aggregateTimeForRecordWithinWindow(child);
             }
-            var categoryName = uiUtils.categoryForRecord(record).name;
+            var categoryName = WebInspector.TimelineUIUtils.categoryForRecord(record).name;
             var ownTime = Math.min(endTime, record.endTime()) - Math.max(startTime, record.startTime()) - childrenTime;
             aggregatedStats[categoryName] = (aggregatedStats[categoryName] || 0) + ownTime;
         }
 
         var mainThreadTasks = this._model.mainThreadTasks();
         var taskIndex = insertionIndexForObjectInListSortedByFunction(startTime, mainThreadTasks, compareEndTime);
         for (; taskIndex < mainThreadTasks.length; ++taskIndex) {
             var task = mainThreadTasks[taskIndex];
             if (task.startTime() > endTime)
                 break;
@@ skipping 283 matching lines @@
 
     /**
      * @param {!Node} node
      */
     showInDetails: function(node) {},
 }
 
 /**
  * @constructor
  * @extends {WebInspector.TimelineModel.Filter}
- * @param {!WebInspector.TimelineUIUtils} uiUtils
  */
-WebInspector.TimelineCategoryFilter = function(uiUtils)
+WebInspector.TimelineCategoryFilter = function()
 {
     WebInspector.TimelineModel.Filter.call(this);
-    this._uiUtils = uiUtils;
 }
 
 WebInspector.TimelineCategoryFilter.prototype = {
     /**
      * @param {!WebInspector.TimelineModel.Record} record
      * @return {boolean}
      */
     accept: function(record)
     {
-        return !this._uiUtils.categoryForRecord(record).hidden;
+        return !WebInspector.TimelineUIUtils.categoryForRecord(record).hidden;
     },
 
     __proto__: WebInspector.TimelineModel.Filter.prototype
 }
 
 /**
  * @constructor
  * @extends {WebInspector.TimelineModel.Filter}
  */
 WebInspector.TimelineIsLongFilter = function()
@@ skipping 21 matching lines @@
         return this._minimumRecordDuration ? ((record.endTime() - record.startTime()) >= this._minimumRecordDuration) : true;
     },
 
     __proto__: WebInspector.TimelineModel.Filter.prototype
 
 }
 
 /**
  * @constructor
  * @extends {WebInspector.TimelineModel.Filter}
- * @param {!WebInspector.TimelineUIUtils} uiUtils
  */
-WebInspector.TimelineTextFilter = function(uiUtils)
+WebInspector.TimelineTextFilter = function()
 {
     WebInspector.TimelineModel.Filter.call(this);
-    this._uiUtils = uiUtils;
 }
 
 WebInspector.TimelineTextFilter.prototype = {
     /**
      * @return {boolean}
      */
     isEmpty: function()
     {
         return !this._regex;
     },
 
     /**
      * @param {?RegExp} regex
      */
     setRegex: function(regex)
     {
         this._regex = regex;
         this.notifyFilterChanged();
     },
 
     /**
      * @param {!WebInspector.TimelineModel.Record} record
      * @return {boolean}
      */
     accept: function(record)
     {
-        return !this._regex || this._uiUtils.testContentMatching(record, this._regex);
+        return !this._regex || WebInspector.TimelineUIUtils.testContentMatching(record, this._regex);
     },
 
     __proto__: WebInspector.TimelineModel.Filter.prototype
 }
 
 WebInspector.TimelinePanel.show = function()
 {
     WebInspector.inspectorView.setCurrentPanel(WebInspector.TimelinePanel._instance());
 }
 
@@ skipping 17 matching lines @@
 
 WebInspector.TimelinePanelFactory.prototype = {
     /**
      * @return {!WebInspector.Panel}
      */
     createPanel: function()
     {
         return WebInspector.TimelinePanel._instance();
     }
 }