[Devtools] Prepare network log view for grouping support

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 62 matching lines @@
 
     /** @type {!Map.<string, !Network.NetworkDataGridNode>} */
     this._nodesByRequestId = new Map();
     /** @type {!Object.<string, boolean>} */
     this._staleRequestIds = {};
     /** @type {number} */
     this._mainRequestLoadTime = -1;
     /** @type {number} */
     this._mainRequestDOMContentLoadedTime = -1;
     this._matchedRequestCount = 0;
+    /** @type {!Array<!Array<!Object>>} */
     this._highlightedSubstringChanges = [];
 
     /** @type {!Array.<!Network.NetworkLogView.Filter>} */
     this._filters = [];
     /** @type {?Network.NetworkLogView.Filter} */
     this._timeFilter = null;
+    /** @type {?Network.NetworkDataGridNode} */
     this._hoveredNode = null;
 
-    this._currentMatchedRequestNode = null;
-    this._currentMatchedRequestIndex = -1;
+    /** @type {?Network.NetworkLogEntry} */
+    this._currentMatchedLogEntry = null;
+    this._currentMatchedLogEntryIndex = -1;
 
     /** @type {!Components.Linkifier} */
     this.linkifier = new Components.Linkifier();
 
     this._recording = false;
     this._preserveLog = false;
 
     this._headerHeight = 0;
 
     this._addFilters();
@@ skipping 225 matching lines @@
    */
   static _requestTimeFilter(windowStart, windowEnd, request) {
     if (request.issueTime() > windowEnd)
       return false;
     if (request.endTime !== -1 && request.endTime < windowStart)
       return false;
     return true;
   }
 
   /**
+   * @return {!Array<!Network.NetworkLogEntry>}
+   */
+  flatenChildren() {

[dgozman, 2016/11/28 18:39:51]

These are definitely not children of log view. flatEntries?

[allada, 2016/11/29 00:35:09]

Done.

+    return this._dataGrid.rootNode().flatenChildren();
+  }
+
+  /**
    * @return {number}
    */
   headerHeight() {
     return this._headerHeight;
   }
 
   /**
    * @param {boolean} recording
    */
   setRecording(recording) {
@@ skipping 150 matching lines @@
    * @return {!Array.<!Element>}
    */
   elementsToRestoreScrollPositionsFor() {
     if (!this._dataGrid)  // Not initialized yet.
       return [];
     return [this._dataGrid.scrollContainer];
   }
 
   _setupDataGrid() {
     this._dataGrid = this._columns.dataGrid();
+    var contextMenuHandler = this.handleContextMenuForLogEntry.bind(this);
     this._dataGrid.setRowContextMenuCallback(
-        (contextMenu, node) => this.handleContextMenuForRequest(contextMenu, node.request()));
+        (contextMenu, node) => contextMenuHandler(contextMenu, /** @type {!Network.NetworkDataGridNode} */ (node)));
     this._dataGrid.setStickToBottom(true);
     this._dataGrid.setName('networkLog');
     this._dataGrid.setResizeMethod(UI.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);
   }
 
   /**
    * @param {!Event} event
    */
   _dataGridMouseMove(event) {
     var node = this._dataGrid.dataGridNodeFromNode(event.target);
     var highlightInitiatorChain = event.shiftKey;
     this._setHoveredNode(node, highlightInitiatorChain);
+    // TODO(allada) Support groupping initiator chain instead of first request.
     this._highlightInitiatorChain((highlightInitiatorChain && node) ? node.request() : null);
   }
 
   _dataGridMouseLeave() {
     this._setHoveredNode(null);
     this._highlightInitiatorChain(null);
   }
 
   /**
    * @param {?Network.NetworkLogEntry} logEntry
    * @param {boolean} highlightInitiatorChain
    */
   setHoveredLogEntry(logEntry, highlightInitiatorChain) {
     // TODO(allada) Move this into LogEntry/NetworkDataGridNode.
     this._setHoveredNode(/** @type {?Network.NetworkDataGridNode} */ (logEntry), highlightInitiatorChain);
+    // TODO(allada) Support groupping initiator chain instead of first request.
     this._highlightInitiatorChain((logEntry && highlightInitiatorChain) ? logEntry.request() : null);
   }
 
   /**
    * @param {?Network.NetworkDataGridNode} node
    * @param {boolean=} highlightInitiatorChain
    */
   _setHoveredNode(node, highlightInitiatorChain) {
     if (this._hoveredNode)
       this._hoveredNode.element().classList.remove('hover');
@@ skipping 25 matching lines @@
           continue;
         node.element().classList.remove('network-node-on-initiator-path', 'network-node-on-initiated-path');
       }
       return;
     }
 
     var initiatorGraph = request.initiatorGraph();
     for (var node of this._nodesByRequestId.values()) {
       if (!node.dataGrid)
         continue;
-      node.element().classList.toggle(
-          'network-node-on-initiator-path',
-          node.request() !== request && initiatorGraph.initiators.has(node.request()));
-      node.element().classList.toggle(
-          'network-node-on-initiated-path', node.request() !== request && initiatorGraph.initiated.has(node.request()));
+      var hasInitiator = false;
+      var hasInitiated = false;
+      for (var childRequest of node.requests()) {
+        if (childRequest === request)
+          continue;
+        hasInitiator = initiatorGraph.initiators.has(childRequest);
+        hasInitiated = initiatorGraph.initiated.has(childRequest);
+        if (hasInitiator || hasInitiated)
+          break;
+      }
+
+      node.element().classList.toggle('network-node-on-initiator-path', hasInitiator);
+      node.element().classList.toggle('network-node-on-initiated-path', hasInitiated);
     }
   }
 
   _updateSummaryBar() {
     var requestsNumber = this._nodesByRequestId.size;
 
     if (!requestsNumber) {
       this._showRecordingHint();
       return;
     }
     this._hideRecordingHint();
 
     var transferSize = 0;
     var selectedRequestsNumber = 0;
     var selectedTransferSize = 0;
     var baseTime = -1;
     var maxTime = -1;
-    var nodes = this._nodesByRequestId.valuesArray();
-    for (var i = 0; i < nodes.length; ++i) {
-      var request = nodes[i].request();
-      var requestTransferSize = request.transferSize;
-      transferSize += requestTransferSize;
-      if (!nodes[i][Network.NetworkLogView._isFilteredOutSymbol]) {
-        selectedRequestsNumber++;
-        selectedTransferSize += requestTransferSize;
+    for (var node of this._nodesByRequestId.values()) {
+      var isFilteredOut = node[Network.NetworkLogView._isFilteredOutSymbol];
+      for (var request of node.requests()) {
+        var requestTransferSize = request.transferSize;
+        transferSize += requestTransferSize;
+        if (!isFilteredOut) {
+          selectedRequestsNumber++;
+          selectedTransferSize += requestTransferSize;
+        }
+        if (request.url === request.target().inspectedURL() && request.resourceType() === Common.resourceTypes.Document)
+          baseTime = request.startTime;
+        if (request.endTime > maxTime)
+          maxTime = request.endTime;
       }
-      if (request.url === request.target().inspectedURL() && request.resourceType() === Common.resourceTypes.Document)
-        baseTime = request.startTime;
-      if (request.endTime > maxTime)
-        maxTime = request.endTime;
     }
 
     var summaryBar = this._summaryBarElement;
     summaryBar.removeChildren();
     var separator = '\u2002\u2758\u2002';
     var text = '';
     /**
      * @param {string} chunk
      * @return {!Element}
      */
@@ skipping 142 matching lines @@
     this._columns.wasShown();
   }
 
   /**
    * @override
    */
   willHide() {
     this._columns.willHide();
   }
 
-  /**
-   * @return {!Array<!Network.NetworkDataGridNode>}
-   */
-  flatNodesList() {
-    return this._dataGrid.flatNodesList();
-  }
-
   _refresh() {
     this._needsRefresh = false;
 
     if (this._refreshRequestId) {
       this.element.window().cancelAnimationFrame(this._refreshRequestId);
       delete this._refreshRequestId;
     }
 
     this.removeAllNodeHighlights();
 
     var oldBoundary = this.calculator().boundary();
     this._timeCalculator.updateBoundariesForEventTime(this._mainRequestLoadTime);
     this._durationCalculator.updateBoundariesForEventTime(this._mainRequestLoadTime);
     this._timeCalculator.updateBoundariesForEventTime(this._mainRequestDOMContentLoadedTime);
     this._durationCalculator.updateBoundariesForEventTime(this._mainRequestDOMContentLoadedTime);
 
     var dataGrid = this._dataGrid;
     var rootNode = dataGrid.rootNode();
+
     /** @type {!Array<!Network.NetworkDataGridNode> } */
     var nodesToInsert = [];
     /** @type {!Array<!Network.NetworkDataGridNode> } */
     var nodesToRefresh = [];
     for (var requestId in this._staleRequestIds) {
       var node = this._nodesByRequestId.get(requestId);
       if (!node)
         continue;
       var isFilteredOut = !this._applyFilter(node);
       if (isFilteredOut && node === this._hoveredNode)
         this._setHoveredNode(null);
       if (node[Network.NetworkLogView._isFilteredOutSymbol] !== isFilteredOut) {
         if (!node[Network.NetworkLogView._isFilteredOutSymbol])
           rootNode.removeChild(node);
 
         node[Network.NetworkLogView._isFilteredOutSymbol] = isFilteredOut;
 
         if (!node[Network.NetworkLogView._isFilteredOutSymbol])
           nodesToInsert.push(node);
       }
       if (!isFilteredOut)
         nodesToRefresh.push(node);
-      var request = node.request();
-      this._timeCalculator.updateBoundaries(request);
-      this._durationCalculator.updateBoundaries(request);
+      for (var request of node.requests()) {
+        this._timeCalculator.updateBoundaries(request);
+        this._durationCalculator.updateBoundaries(request);
+      }
     }
 
-    for (var i = 0; i < nodesToInsert.length; ++i) {
-      var node = nodesToInsert[i];
-      var request = node.request();
+    for (var node of nodesToInsert) {
       dataGrid.insertChild(node);
-      node[Network.NetworkLogView._isMatchingSearchQuerySymbol] = this._matchRequest(request);
+      node[Network.NetworkLogView._isMatchingSearchQuerySymbol] = this._matchLogEntry(node);
     }
 
     for (var node of nodesToRefresh)
       node.refresh();
 
     this._highlightNthMatchedRequestForSearch(
-        this._updateMatchCountAndFindMatchIndex(this._currentMatchedRequestNode), false);
+        this._updateMatchCountAndFindMatchIndex(this._currentMatchedLogEntry), false);
 
     this._staleRequestIds = {};
     this._updateSummaryBar();
 
     this._columns.dataChanged();
   }
 
   reset() {
     this._requestWithHighlightedInitiators = null;
     this.dispatchEventToListeners(Network.NetworkLogView.Events.RequestSelected, null);
@@ skipping 49 matching lines @@
    * @param {!SDK.NetworkRequest} request
    */
   _appendRequest(request) {
     var node = new Network.NetworkDataGridNode(this, request);
     node[Network.NetworkLogView._isFilteredOutSymbol] = true;
     node[Network.NetworkLogView._isMatchingSearchQuerySymbol] = false;
 
     // In case of redirect request id is reassigned to a redirected
     // request and we need to update _nodesByRequestId and search results.
     var originalRequestNode = this._nodesByRequestId.get(request.requestId);
-    if (originalRequestNode)
-      this._nodesByRequestId.set(originalRequestNode.request().requestId, originalRequestNode);
+    var originalRequest = originalRequestNode ? originalRequestNode.request() : null;
+    if (originalRequest)
+      this._nodesByRequestId.set(originalRequest.requestId, originalRequestNode);
+
     this._nodesByRequestId.set(request.requestId, node);
 
     // Pull all the redirects of the main request upon commit load.
-    if (request.redirects) {
-      for (var i = 0; i < request.redirects.length; ++i)
-        this._refreshRequest(request.redirects[i]);
-    }
+    if (request.redirects)
+      request.redirects.forEach(this._refreshRequest.bind(this));
 
     this._refreshRequest(request);
   }
 
   /**
    * @param {!Common.Event} event
    */
   _onRequestUpdated(event) {
     var request = /** @type {!SDK.NetworkRequest} */ (event.data);
     this._refreshRequest(request);
@@ skipping 90 matching lines @@
 
   /**
    * @param {boolean} gridMode
    */
   switchViewMode(gridMode) {
     this._columns.switchViewMode(gridMode);
   }
 
   /**
    * @param {!UI.ContextMenu} contextMenu
-   * @param {!SDK.NetworkRequest} request
+   * @param {!Network.NetworkLogEntry} logEntry
    */
-  handleContextMenuForRequest(contextMenu, request) {
+  handleContextMenuForLogEntry(contextMenu, logEntry) {
+    // TODO(allada) Support groupped items context menu.
+    var request = logEntry.request();
+    if (!request)
+      return;
     contextMenu.appendApplicableItems(request);
     var copyMenu = contextMenu.appendSubMenuItem(Common.UIString('Copy'));
     if (request) {
       copyMenu.appendItem(
           UI.copyLinkAddressLabel(), InspectorFrontendHost.copyText.bind(InspectorFrontendHost, request.contentURL()));
       copyMenu.appendSeparator();
 
       if (request.requestHeadersText()) {
         copyMenu.appendItem(
             Common.UIString.capitalize('Copy ^request ^headers'), this._copyRequestHeaders.bind(this, request));
@@ skipping 48 matching lines @@
       }
     }
 
     if (request && request.resourceType() === Common.resourceTypes.XHR) {
       contextMenu.appendSeparator();
       contextMenu.appendItem(Common.UIString('Replay XHR'), request.replayXHR.bind(request));
       contextMenu.appendSeparator();
     }
   }
 
+  /**
+   * @return {!Array<!SDK.NetworkRequest>}
+   */
+  _allRequests() {
+    var requests = [];
+    for (var node of this._nodesByRequestId.values())
+      requests = requests.concat(node.requests());

[dgozman, 2016/11/28 18:39:51]

Should this be node.request() instead?

[allada, 2016/11/29 00:35:09]

Done.

+    return requests;
+  }
+
   _harRequests() {
-    var requests = this._nodesByRequestId.valuesArray().map(function(node) {
-      return node.request();
-    });
-    var httpRequests = requests.filter(Network.NetworkLogView.HTTPRequestsFilter);
+    var httpRequests = this._allRequests().filter(Network.NetworkLogView.HTTPRequestsFilter);
     return httpRequests.filter(Network.NetworkLogView.FinishedRequestsFilter);
   }
 
   _copyAll() {
     var harArchive = {log: (new SDK.HARLog(this._harRequests())).build()};
     InspectorFrontendHost.copyText(JSON.stringify(harArchive, null, 2));
   }
 
   /**
    * @param {!SDK.NetworkRequest} request
@@ skipping 22 matching lines @@
    */
   _copyResponseHeaders(request) {
     InspectorFrontendHost.copyText(request.responseHeadersText);
   }
 
   /**
    * @param {!SDK.NetworkRequest} request
    * @param {string} platform
    */
   _copyCurlCommand(request, platform) {
-    InspectorFrontendHost.copyText(this._generateCurlCommand(request, platform));
+    InspectorFrontendHost.copyText(this._generateCurlCommand(platform, request));
   }
 
   /**
    * @param {string} platform
    */
   _copyAllCurlCommand(platform) {
-    var requests = this._nodesByRequestId.valuesArray().map(node => node.request());
-    var commands = [];
-    for (var request of requests)
-      commands.push(this._generateCurlCommand(request, platform));
+    var commands = this._allRequests().map(this._generateCurlCommand.bind(this, platform));
     if (platform === 'win')
       InspectorFrontendHost.copyText(commands.join(' &\r\n'));
     else
       InspectorFrontendHost.copyText(commands.join(' ;\n'));
   }
 
   _exportAll() {
     var url = SDK.targetManager.mainTarget().inspectedURL();
     var parsedURL = url.asParsedURL();
     var filename = parsedURL ? parsedURL.host : 'network-log';
@@ skipping 18 matching lines @@
     if (confirm(Common.UIString('Are you sure you want to clear browser cache?')))
       SDK.multitargetNetworkManager.clearBrowserCache();
   }
 
   _clearBrowserCookies() {
     if (confirm(Common.UIString('Are you sure you want to clear browser cookies?')))
       SDK.multitargetNetworkManager.clearBrowserCookies();
   }
 
   /**
-   * @param {!SDK.NetworkRequest} request
+   * @param {!Network.NetworkLogEntry} logEntry
    * @return {boolean}
    */
-  _matchRequest(request) {
+  _matchLogEntry(logEntry) {
     var re = this._searchRegex;
     if (!re)
       return false;
-
-    var text = this._networkLogLargeRowsSetting.get() ? request.path() + '/' + request.name() : request.name();
-    return re.test(text);
+    var requests = logEntry.request() ? [logEntry.request()] : [];

[dgozman, 2016/11/28 18:39:51]

I don't get this line.

[allada, 2016/11/29 00:35:09]

Done.

+    for (var request of requests) {
+      var text = this._networkLogLargeRowsSetting.get() ? request.path() + '/' + request.name() : request.name();
+      if (re.test(text))
+        return true;
+    }
+    return false;
   }
 
   _clearSearchMatchedList() {
     this._matchedRequestCount = -1;
-    this._currentMatchedRequestNode = null;
+    this._currentMatchedLogEntry = null;
     this._removeAllHighlights();
   }
 
   _removeAllHighlights() {
     this.removeAllNodeHighlights();
     for (var i = 0; i < this._highlightedSubstringChanges.length; ++i)
       UI.revertDomChanges(this._highlightedSubstringChanges[i]);
     this._highlightedSubstringChanges = [];
   }
 
   dataGridSorted() {
     this._highlightNthMatchedRequestForSearch(
-        this._updateMatchCountAndFindMatchIndex(this._currentMatchedRequestNode), false);
+        this._updateMatchCountAndFindMatchIndex(this._currentMatchedLogEntry), false);
   }
 
   /**
    * @param {number} n
    * @param {boolean} reveal
    */
   _highlightNthMatchedRequestForSearch(n, reveal) {
     this._removeAllHighlights();
 
-    /** @type {!Array.<!Network.NetworkDataGridNode>} */
-    var nodes = this._dataGrid.rootNode().children;
     var matchCount = 0;
-    var node = null;
-    for (var i = 0; i < nodes.length; ++i) {
-      if (nodes[i][Network.NetworkLogView._isMatchingSearchQuerySymbol]) {
-        if (matchCount === n) {
-          node = nodes[i];
-          break;
-        }
-        matchCount++;
+    var request = null;
+    for (var node of this.flatenChildren()) {
+      if (!node[Network.NetworkLogView._isMatchingSearchQuerySymbol])
+        continue;
+      if (matchCount === n) {
+        // TODO(allada) This should support multiple requests.
+        request = node.request();
+        break;
       }
+      matchCount++;
     }
-    if (!node) {
-      this._currentMatchedRequestNode = null;
+    if (!request) {
+      this._currentMatchedLogEntry = null;
       return;
     }
 
-    var request = node.request();
     if (reveal)
       Common.Revealer.reveal(request);
     var highlightedSubstringChanges = node.highlightMatchedSubstring(this._searchRegex);
     this._highlightedSubstringChanges.push(highlightedSubstringChanges);
 
-    this._currentMatchedRequestNode = node;
-    this._currentMatchedRequestIndex = n;
+    this._currentMatchedLogEntry = node;
+    this._currentMatchedLogEntryIndex = n;
     this.dispatchEventToListeners(Network.NetworkLogView.Events.SearchIndexUpdated, n);
   }
 
   /**
    * @override
    * @param {!UI.SearchableView.SearchConfig} searchConfig
    * @param {boolean} shouldJump
    * @param {boolean=} jumpBackwards
    */
   performSearch(searchConfig, shouldJump, jumpBackwards) {
     var query = searchConfig.query;
-    var currentMatchedRequestNode = this._currentMatchedRequestNode;
+    var currentMatchedLogEntry = this._currentMatchedLogEntry;
     this._clearSearchMatchedList();
     this._searchRegex = createPlainTextSearchRegex(query, 'i');
 
-    /** @type {!Array.<!Network.NetworkDataGridNode>} */
-    var nodes = this._dataGrid.rootNode().children;
-    for (var i = 0; i < nodes.length; ++i)
-      nodes[i][Network.NetworkLogView._isMatchingSearchQuerySymbol] = this._matchRequest(nodes[i].request());
-    var newMatchedRequestIndex = this._updateMatchCountAndFindMatchIndex(currentMatchedRequestNode);
+    for (var node of this.flatenChildren())
+      node[Network.NetworkLogView._isMatchingSearchQuerySymbol] = this._matchLogEntry(node);
+
+    var newMatchedRequestIndex = this._updateMatchCountAndFindMatchIndex(currentMatchedLogEntry);
     if (!newMatchedRequestIndex && jumpBackwards)
       newMatchedRequestIndex = this._matchedRequestCount - 1;
     this._highlightNthMatchedRequestForSearch(newMatchedRequestIndex, shouldJump);
   }
 
   /**
    * @override
    * @return {boolean}
    */
   supportsCaseSensitiveSearch() {
     return false;
   }
 
   /**
    * @override
    * @return {boolean}
    */
   supportsRegexSearch() {
     return true;
   }
 
   /**
-   * @param {?Network.NetworkDataGridNode} node
+   * @param {?Network.NetworkLogEntry} logEntry
    * @return {number}
    */
-  _updateMatchCountAndFindMatchIndex(node) {
-    /** @type {!Array.<!Network.NetworkDataGridNode>} */
-    var nodes = this._dataGrid.rootNode().children;
+  _updateMatchCountAndFindMatchIndex(logEntry) {
     var matchCount = 0;
     var matchIndex = 0;
-    for (var i = 0; i < nodes.length; ++i) {
-      if (!nodes[i][Network.NetworkLogView._isMatchingSearchQuerySymbol])
+    for (var item of this.flatenChildren()) {
+      if (!item[Network.NetworkLogView._isMatchingSearchQuerySymbol])
         continue;
-      if (node === nodes[i])
+      if (logEntry === item)
         matchIndex = matchCount;
       matchCount++;
     }
     if (this._matchedRequestCount !== matchCount) {
       this._matchedRequestCount = matchCount;
       this.dispatchEventToListeners(Network.NetworkLogView.Events.SearchCountUpdated, matchCount);
     }
     return matchIndex;
   }
 
   /**
    * @param {number} index
    * @return {number}
    */
   _normalizeSearchResultIndex(index) {
     return (index + this._matchedRequestCount) % this._matchedRequestCount;
   }
 
   /**
    * @param {!Network.NetworkDataGridNode} node
    * @return {boolean}
    */
   _applyFilter(node) {
-    var request = node.request();
-    if (this._timeFilter && !this._timeFilter(request))
-      return false;
-    var categoryName = request.resourceType().category().title;
-    if (!this._resourceCategoryFilterUI.accept(categoryName))
-      return false;
-    if (this._dataURLFilterUI.checked() && request.parsedURL.isDataURL())
-      return false;
-    if (request.statusText === 'Service Worker Fallback Required')
-      return false;
-    for (var i = 0; i < this._filters.length; ++i) {
-      if (!this._filters[i](request))
-        return false;
+    for (var request of node.requests()) {
+      if (this._timeFilter && !this._timeFilter(request))
+        continue;
+      var categoryName = request.resourceType().category().title;
+      if (!this._resourceCategoryFilterUI.accept(categoryName))
+        continue;
+      if (this._dataURLFilterUI.checked() && request.parsedURL.isDataURL())
+        continue;
+      if (request.statusText === 'Service Worker Fallback Required')
+        continue;
+      if (this._filters.some(filter => !filter(request)))
+        continue;
+      return true;
     }
-    return true;
+    return false;
   }
 
   /**
    * @param {string} query
    */
   _parseFilterQuery(query) {
     var parsedQuery;
     if (this._textFilterUI.isRegexChecked() && query !== '')
       parsedQuery = {text: [query], filters: []};
     else
@@ skipping 120 matching lines @@
     this._removeAllHighlights();
     this._invalidateAllItems();
   }
 
   /**
    * @override
    */
   jumpToPreviousSearchResult() {
     if (!this._matchedRequestCount)
       return;
-    var index = this._normalizeSearchResultIndex(this._currentMatchedRequestIndex - 1);
+    var index = this._normalizeSearchResultIndex(this._currentMatchedLogEntryIndex - 1);
     this._highlightNthMatchedRequestForSearch(index, true);
   }
 
   /**
    * @override
    */
   jumpToNextSearchResult() {
     if (!this._matchedRequestCount)
       return;
-    var index = this._normalizeSearchResultIndex(this._currentMatchedRequestIndex + 1);
+    var index = this._normalizeSearchResultIndex(this._currentMatchedLogEntryIndex + 1);
     this._highlightNthMatchedRequestForSearch(index, true);
   }
 
   /**
    * @override
    */
   searchCanceled() {
     delete this._searchRegex;
     this._clearSearchMatchedList();
     this.dispatchEventToListeners(Network.NetworkLogView.Events.SearchCountUpdated, 0);
@@ skipping 21 matching lines @@
 
   /**
    * @param {!Network.NetworkDataGridNode} node
    */
   _highlightNode(node) {
     UI.runCSSAnimationOnce(node.element(), 'highlighted-row');
     this._highlightedNode = node;
   }
 
   /**
+   * @param {string} platform
    * @param {!SDK.NetworkRequest} request
-   * @param {string} platform
    * @return {string}
    */
-  _generateCurlCommand(request, platform) {
+  _generateCurlCommand(platform, request) {
     var command = ['curl'];
     // These headers are derived from URL (except "version") and would be added by cURL anyway.
     var ignoredHeaders = {'host': 1, 'method': 1, 'path': 1, 'scheme': 1, 'version': 1};
 
     function escapeStringWin(str) {
       /* If there are no new line characters do not escape the " characters
                since it only uglifies the command.
 
                Because cmd.exe parser and MS Crt arguments parsers use some of the
                same escape characters, they can interact with each other in
@@ skipping 150 matching lines @@
   Running: 'running',
   FromCache: 'from-cache'
 };
 
 /** @type {!Array<string>} */
 Network.NetworkLogView._searchKeys =
     Object.keys(Network.NetworkLogView.FilterType).map(key => Network.NetworkLogView.FilterType[key]);
 
 /** @typedef {function(!SDK.NetworkRequest): boolean} */
 Network.NetworkLogView.Filter;