[Devtools] Moved NetworkWaterfallColumn to use NetworkLogEntry

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 /**
  * @unrestricted
  */
 Network.NetworkLogViewColumns = class {
   /**
    * @param {!Network.NetworkLogView} networkLogView
    * @param {!Network.NetworkTransferTimeCalculator} timeCalculator
@@ skipping 104 matching lines @@
   }
 
   _setupWaterfall() {
     this._waterfallColumn =
         new Network.NetworkWaterfallColumn(this._networkLogView.rowHeight(), this._networkLogView.calculator());
 
     this._waterfallColumn.element.addEventListener('contextmenu', handleContextMenu.bind(this));
     this._waterfallColumn.element.addEventListener('mousewheel', this._onMouseWheel.bind(this, false), {passive: true});
     this._dataGridScroller.addEventListener('mousewheel', this._onMouseWheel.bind(this, true), true);
 
+    this._waterfallColumn.element.addEventListener('mousemove', event => {
+      var hoveredLogEntry =
+          this._waterfallColumn.getLogEntryFromPoint(event.offsetX, event.offsetY + event.target.offsetTop);
+      this._networkLogView.setHoveredLogEntry(hoveredLogEntry, event.shiftKey);
+    }, true);
     this._waterfallColumn.element.addEventListener(
-        'mousemove',
-        event => this._networkLogView.setHoveredRequest(
-            this._waterfallColumn.getRequestFromPoint(event.offsetX, event.offsetY + event.target.offsetTop),
-            event.shiftKey),
-        true);
-    this._waterfallColumn.element.addEventListener(
-        'mouseleave', this._networkLogView.setHoveredRequest.bind(this._networkLogView, null, false), true);
+        'mouseleave', this._networkLogView.setHoveredLogEntry.bind(this._networkLogView, null, false), true);
 
     this._waterfallScroller = this._waterfallColumn.contentElement.createChild('div', 'network-waterfall-v-scroll');
     this._waterfallScroller.addEventListener('scroll', this._syncScrollers.bind(this), {passive: true});
     this._waterfallScrollerContent = this._waterfallScroller.createChild('div', 'network-waterfall-v-scroll-content');
 
     this._dataGrid.addEventListener(UI.DataGrid.Events.PaddingChanged, () => {
       this._waterfallScrollerWidthIsStale = true;
       this._syncScrollers();
     });
     this._dataGrid.addEventListener(
         UI.ViewportDataGrid.Events.ViewportCalculated, this._redrawWaterfallColumn.bind(this));
 
     this._createWaterfallHeader();
     this._waterfallColumn.contentElement.classList.add('network-waterfall-view');
 
     this._waterfallColumn.setMinimumSize(100, 0);
     this._splitWidget.setSidebarWidget(this._waterfallColumn);
 
     this.switchViewMode(false);
 
     /**
      * @param {!Event} event
      * @this {Network.NetworkLogViewColumns}
      */
     function handleContextMenu(event) {
-      var request = this._waterfallColumn.getRequestFromPoint(event.offsetX, event.offsetY);
-      if (!request)
+      var logEntry = this._waterfallColumn.getLogEntryFromPoint(event.offsetX, event.offsetY);
+      if (!logEntry)
         return;
       var contextMenu = new UI.ContextMenu(event);
-      this._networkLogView.handleContextMenuForRequest(contextMenu, request);
+      this._networkLogView.handleContextMenuForRequest(contextMenu, logEntry.request());
       contextMenu.show();
     }
   }
 
   /**
    * @param {boolean} shouldConsume
    * @param {!Event} event
    */
   _onMouseWheel(shouldConsume, event) {
     if (shouldConsume)
       event.consume(true);
     this._activeScroller.scrollTop -= event.wheelDeltaY;
     this._syncScrollers();
-    this._networkLogView.setHoveredRequest(
-        this._waterfallColumn.getRequestFromPoint(event.offsetX, event.offsetY), event.shiftKey);
+    var logEntry = this._waterfallColumn.getLogEntryFromPoint(event.offsetX, event.offsetY);
+    this._networkLogView.setHoveredLogEntry(logEntry, event.shiftKey);
   }
 
   _syncScrollers() {
     if (!this._waterfallColumn.isShowing())
       return;
     this._waterfallScrollerContent.style.height = this._dataGridScroller.scrollHeight + 'px';
     this._updateScrollerWidthIfNeeded();
     this._dataGridScroller.scrollTop = this._waterfallScroller.scrollTop;
   }
 
   _updateScrollerWidthIfNeeded() {
     if (this._waterfallScrollerWidthIsStale) {
       this._waterfallScrollerWidthIsStale = false;
       this._waterfallColumn.setRightPadding(
           this._waterfallScroller.offsetWidth - this._waterfallScrollerContent.offsetWidth);
     }
   }
 
   _redrawWaterfallColumn() {
     if (!this._waterfallRequestsAreStale) {
       this._updateScrollerWidthIfNeeded();
       this._waterfallColumn.update(
           this._activeScroller.scrollTop, this._eventDividersShown ? this._eventDividers : undefined);
       return;
     }
-    var currentNode = this._dataGrid.rootNode();
-    /** @type {!Network.NetworkWaterfallColumn.RequestData} */
-    var requestData = {requests: [], navigationRequest: null};
-    while (currentNode = currentNode.traverseNextNode(true)) {
-      if (currentNode.isNavigationRequest())
-        requestData.navigationRequest = currentNode.request();
-      requestData.requests.push(currentNode.request());
-    }
-    this._waterfallColumn.update(this._activeScroller.scrollTop, this._eventDividers, requestData);
+    var nodes = this._networkLogView.flatNodesList();
+    this._waterfallColumn.update(this._activeScroller.scrollTop, this._eventDividers, nodes);
   }
 
   /**
-   * @param {?SDK.NetworkRequest} request
+   * @param {?Network.NetworkLogEntry} logEntry
    * @param {boolean} highlightInitiatorChain
    */
-  setHoveredRequest(request, highlightInitiatorChain) {
-    this._waterfallColumn.setHoveredRequest(request, highlightInitiatorChain);
+  setHoveredLogEntry(logEntry, highlightInitiatorChain) {
+    this._waterfallColumn.setHoveredLogEntry(logEntry, highlightInitiatorChain);
   }
 
   _createWaterfallHeader() {
     this._waterfallHeaderElement = this._waterfallColumn.contentElement.createChild('div', 'network-waterfall-header');
     this._waterfallHeaderElement.addEventListener('click', waterfallHeaderClicked.bind(this));
     this._waterfallHeaderElement.addEventListener(
         'contextmenu', event => this._innerHeaderContextMenu(new UI.ContextMenu(event)));
     var innerElement = this._waterfallHeaderElement.createChild('div');
     innerElement.textContent = Common.UIString('Waterfall');
     this._waterfallColumnSortIcon = this._waterfallHeaderElement.createChild('div', 'sort-order-icon-container')
@@ skipping 595 matching lines @@
 /**
  * @enum {string}
  */
 Network.NetworkLogViewColumns.WaterfallSortIds = {
   StartTime: 'startTime',
   ResponseTime: 'responseReceivedTime',
   EndTime: 'endTime',
   Duration: 'duration',
   Latency: 'latency'
 };