[Devtools] Move NetworkTimelineColumn into NetworkLogViewColumns P1

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

 /*
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2008, 2009 Anthony Ricaud <rik@webkit.org>
  * Copyright (C) 2011 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 33 matching lines @@
     this.registerRequiredCSS("network/networkLogView.css");
 
     this._networkHideDataURLSetting = WebInspector.settings.createSetting("networkHideDataURL", false);
     this._networkResourceTypeFiltersSetting = WebInspector.settings.createSetting("networkResourceTypeFilters", {});
     this._networkShowPrimaryLoadWaterfallSetting = WebInspector.settings.createSetting("networkShowPrimaryLoadWaterfall", false);
 
     this._filterBar = filterBar;
     this._progressBarContainer = progressBarContainer;
     this._networkLogLargeRowsSetting = networkLogLargeRowsSetting;
 
-    this._columns = new WebInspector.NetworkLogViewColumns(this, networkLogLargeRowsSetting);
+    /** @type {!WebInspector.NetworkTransferTimeCalculator} */
+    this._timeCalculator = new WebInspector.NetworkTransferTimeCalculator();
+    /** @type {!WebInspector.NetworkTransferDurationCalculator} */
+    this._durationCalculator = new WebInspector.NetworkTransferDurationCalculator();
+    this._calculator = this._timeCalculator;
+    this._columns = new WebInspector.NetworkLogViewColumns(this, this._timeCalculator, this._durationCalculator, networkLogLargeRowsSetting);
 
     /** @type {!Map.<string, !WebInspector.NetworkDataGridNode>} */
     this._nodesByRequestId = new Map();
     /** @type {!Object.<string, boolean>} */
     this._staleRequestIds = {};
     /** @type {number} */
     this._mainRequestLoadTime = -1;
     /** @type {number} */
     this._mainRequestDOMContentLoadedTime = -1;
     this._matchedRequestCount = 0;
@@ skipping 202 matching lines @@
     _filterChanged: function(event)
     {
         this.removeAllNodeHighlights();
         this._parseFilterQuery(this._textFilterUI.value());
         this._filterRequests();
     },
 
     _initializeView: function()
     {
         this.element.id = "network-container";
-
-        /** @type {!WebInspector.NetworkTransferTimeCalculator} */
-        this._timeCalculator = new WebInspector.NetworkTransferTimeCalculator();
-        /** @type {!WebInspector.NetworkTransferDurationCalculator} */
-        this._durationCalculator = new WebInspector.NetworkTransferDurationCalculator();
-        this._calculator = this._timeCalculator;
-
+        this._setupDataGrid();
         if (Runtime.experiments.isEnabled("canvasNetworkTimeline")) {
-            this._splitWidget = new WebInspector.SplitWidget(true, false, "networkPanelSplitViewTimeline");
-            this._splitWidget.show(this.element);
-            this._createTable();
-            this._splitWidget.setSidebarWidget(this._dataGrid.asWidget());
-
-            this._summaryBarElement = this.element.createChild("div", "network-summary-bar");
-
-            this._timelineWidget = new WebInspector.VBox();
-            this._createTimelineHeader();
-            this._timelineWidget.element.classList.add("network-timeline-view");
-            this._splitWidget.setMainWidget(this._timelineWidget);
-
-            this._timelineColumn = new WebInspector.NetworkTimelineColumn(this._rowHeight, this._headerHeight, this._calculator, this._dataGrid.scrollContainer);
-
             var dataGridScroller = this._dataGrid.scrollContainer;
+            this._timelineColumn = new WebInspector.NetworkTimelineColumn(this._rowHeight, this._headerHeight, this._calculator, dataGridScroller);
             this._dataGrid.setScrollContainer(this._timelineColumn.getScrollContainer());
-            this._dataGrid.addEventListener(WebInspector.DataGrid.Events.PaddingChanged, () => {
-                this._timelineColumn.setScrollHeight(dataGridScroller.scrollHeight);
-            });
+            this._dataGrid.addEventListener(WebInspector.DataGrid.Events.PaddingChanged, () => this._timelineColumn.setScrollHeight(dataGridScroller.scrollHeight));
             this._dataGrid.addEventListener(WebInspector.ViewportDataGrid.Events.ViewportCalculated, this._redrawTimelineColumn.bind(this));
 
             this._timelineColumn.addEventListener(WebInspector.NetworkTimelineColumn.Events.RequestHovered, requestHovered.bind(this));
-            this._timelineColumn.show(this._timelineWidget.element);
+
+            // TODO(allada) This code needs to be moved into NetworkLogViewColumns.
+            this._createTimelineHeader();
+            this._timelineColumn.contentElement.classList.add("network-timeline-view");
+
+            this._splitWidget = this._columns.splitWidget();
+            this._splitWidget.setMainWidget(this._timelineColumn);
+
+            this._columns.show(this.element);
             this.switchViewMode(false);
         } else {
-            this._createTable();
-            this._dataGrid.asWidget().show(this.element);
-            this._summaryBarElement = this.element.createChild("div", "network-summary-bar");
+            this._columns.show(this.element);
         }
+        this._summaryBarElement = this.element.createChild("div", "network-summary-bar");
 
         this._columns.sortByCurrentColumn();
         this._updateRowsSize();
 
         /**
          * @param {!WebInspector.Event} event
          * @this {WebInspector.NetworkLogView}
          */
         function requestHovered(event)
         {
@@ skipping 53 matching lines @@
      * @override
      * @return {!Array.<!Element>}
      */
     elementsToRestoreScrollPositionsFor: function()
     {
         if (!this._dataGrid) // Not initialized yet.
             return [];
         return [this._dataGrid.scrollContainer];
     },
 
-    _createTable: function()
+    _setupDataGrid: function()
     {
-        this._dataGrid = this._columns.createGrid(this._timeCalculator, this._durationCalculator);
+        this._dataGrid = this._columns.dataGrid();
         this._dataGrid.setRowContextMenuCallback(this._onRowContextMenu.bind(this));
         this._dataGrid.setStickToBottom(true);
         this._dataGrid.setName("networkLog");
         this._dataGrid.setResizeMethod(WebInspector.DataGrid.ResizeMethod.Last);
         this._dataGrid.element.classList.add("network-log-grid");
         this._dataGrid.element.addEventListener("mousedown", this._dataGridMouseDown.bind(this), true);
         this._dataGrid.element.addEventListener("mousemove", this._dataGridMouseMove.bind(this), true);
         this._dataGrid.element.addEventListener("mouseleave", this._dataGridMouseLeave.bind(this), true);
     },
 
@@ skipping 504 matching lines @@
             var node = this._nodesByRequestId.get(request.requestId);
             if (node) {
                 node.markAsNavigationRequest();
                 break;
             }
         }
     },
 
     _createTimelineHeader: function()
     {
-        this._timelineHeaderElement = this._timelineWidget.element.createChild("div", "network-timeline-header");
+        this._timelineHeaderElement = this._timelineColumn.contentElement.createChild("div", "network-timeline-header");
         this._timelineHeaderElement.addEventListener("click", timelineHeaderClicked.bind(this));
         this._timelineHeaderElement.addEventListener("contextmenu", this._columns.headerContextMenuEvent.bind(this._columns));
         var innerElement = this._timelineHeaderElement.createChild("div");
         innerElement.textContent = WebInspector.UIString("Timeline");
         this._timelineColumnSortIcon = this._timelineHeaderElement.createChild("div", "sort-order-icon-container").createChild("div", "sort-order-icon");
 
         /**
          * @this {WebInspector.NetworkLogView}
          */
         function timelineHeaderClicked()
         {
             var sortOrders = WebInspector.DataGrid.Order;
             var sortOrder = this._dataGrid.sortOrder() === sortOrders.Ascending ? sortOrders.Descending : sortOrders.Ascending;
             this._dataGrid.markColumnAsSortedBy("timeline", sortOrder);
             this._columns.sortByCurrentColumn();
         }
     },
 
     /**
      * @param {boolean} gridMode
      */
     switchViewMode: function(gridMode)
     {
         this._columns.switchViewMode(gridMode);
-        if (!Runtime.experiments.isEnabled("canvasNetworkTimeline"))
-            return;
-
-        if (gridMode && this._nodesByRequestId.size)
-            this._splitWidget.showBoth();
-        else
-            this._splitWidget.hideMain();
     },
 
     /**
      * @return {number}
      */
     rowHeight: function()
     {
         return this._rowHeight;
     },
 
@@ skipping 926 matching lines @@
  * @return {boolean}
  */
 WebInspector.NetworkLogView._requestTimeFilter = function(windowStart, windowEnd, request)
 {
     if (request.issueTime() > windowEnd)
         return false;
     if (request.endTime !== -1 && request.endTime < windowStart)
         return false;
     return true;
 };