[Devtools] New network timeline experiment Part 1

third_party/WebKit/Source/devtools/front_end/network/NetworkLogViewColumns.js

Index: third_party/WebKit/Source/devtools/front_end/network/NetworkLogViewColumns.js
diff --git a/third_party/WebKit/Source/devtools/front_end/network/NetworkLogViewColumns.js b/third_party/WebKit/Source/devtools/front_end/network/NetworkLogViewColumns.js
index 6274b10fddb86076a27e82c3a9b25842ab1deb57..25241f12a5152cf6bd425d9fc9fe3ada2b0228ec 100644
--- a/third_party/WebKit/Source/devtools/front_end/network/NetworkLogViewColumns.js
+++ b/third_party/WebKit/Source/devtools/front_end/network/NetworkLogViewColumns.js
@@ -335,9 +335,22 @@ WebInspector.NetworkLogViewColumns._defaultColumns = [
                 }
             ]
         }
-    },
+    }
 ];
 
+(function()

[dgozman, 2016/10/07 21:39:57]

Place this in constructor.

[allada, 2016/10/08 00:13:32]

Done.

+{
+    if (Runtime.experiments.isEnabled("networkCanvasTimeline")) {
+        var timelineColumn = WebInspector.NetworkLogViewColumns._defaultColumns.find(columnConfig => columnConfig.id === "timeline");
+        timelineColumn.visible = false;
+        timelineColumn.hideable = true;
+        timelineColumn.sortConfig = {
+            sortingFunction: WebInspector.NetworkDataGridNode.RequestPropertyComparator.bind(null, "startTime")
+        };
+        delete timelineColumn.sortConfig.entries;

[dgozman, 2016/10/07 21:39:57]

This is not needed - you've just assigned to sortConfig.

[allada, 2016/10/08 00:13:32]

Done.

+    }
+})();
+
 /**
  * @param {!WebInspector.NetworkLogViewColumns.Descriptor} columnConfig
  * @return {!WebInspector.DataGrid.ColumnDescriptor}
@@ -405,7 +418,9 @@ WebInspector.NetworkLogViewColumns.prototype = {
 
         this._timelineGrid = new WebInspector.TimelineGrid();
         this._timelineGrid.element.classList.add("network-timeline-grid");
-        this._dataGrid.element.appendChild(this._timelineGrid.element);
+        if (!Runtime.experiments.isEnabled("networkCanvasTimeline"))
+            this._dataGrid.element.appendChild(this._timelineGrid.element);
+
         this._setupDropdownColumns();
 
         this._dataGrid.markColumnAsSortedBy(WebInspector.NetworkLogViewColumns._initialSortColumn, WebInspector.DataGrid.Order.Ascending);
@@ -691,6 +706,8 @@ WebInspector.NetworkLogViewColumns.prototype = {
 
     updateDividersIfNeeded: function()
     {
+        if (Runtime.experiments.isEnabled("networkCanvasTimeline"))
+            return;
         if (!this._networkLogView.isShowing()) {
             this._networkLogView.scheduleRefresh();
             return;
@@ -765,6 +782,8 @@ WebInspector.NetworkLogViewColumns.prototype = {
      */
     addEventDividers: function(times, className)
     {
+        if (Runtime.experiments.isEnabled("networkCanvasTimeline"))
+            return;
         for (var i = 0; i < times.length; ++i) {
             var element = createElementWithClass("div", "network-event-divider " + className);
             this._timelineGrid.addEventDivider(element);
@@ -778,6 +797,8 @@ WebInspector.NetworkLogViewColumns.prototype = {
 
     _updateEventDividers: function()
     {
+        if (Runtime.experiments.isEnabled("networkCanvasTimeline"))
+            return;
         var calculator = this._calculatorsMap.get(WebInspector.NetworkLogViewColumns._calculatorTypes.Time);
         for (var divider of this._eventDividers) {
             var timePercent = calculator.computePercentageFromEventTime(divider.time);
@@ -788,16 +809,22 @@ WebInspector.NetworkLogViewColumns.prototype = {
 
     hideEventDividers: function()
     {
+        if (Runtime.experiments.isEnabled("networkCanvasTimeline"))
+            return;
         this._timelineGrid.hideEventDividers();
     },
 
     showEventDividers: function()
     {
+        if (Runtime.experiments.isEnabled("networkCanvasTimeline"))
+            return;
         this._timelineGrid.showEventDividers();
     },
 
     _updateRowsSize: function()
     {
+        if (Runtime.experiments.isEnabled("networkCanvasTimeline"))
+            return;
         this._timelineGrid.element.classList.toggle("small", !this._networkLogLargeRowsSetting.get());
     }
 }