DevTools: NetworkPanel: fix node hightlight and reveal on search.

Source/devtools/front_end/network/NetworkPanel.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 173 matching lines @@
         this._summaryBarElement = this.element.createChild("div", "network-summary-bar");
 
         this._updateRowsSize();
 
         this._popoverHelper = new WebInspector.PopoverHelper(this.element, this._getPopoverAnchor.bind(this), this._showPopover.bind(this), this._onHidePopover.bind(this));
         // Enable faster hint.
         this._popoverHelper.setTimeout(100);
 
         this._setCalculator(new WebInspector.NetworkTransferTimeCalculator());
 
-        this.switchToDetailedView();
+        this.switchViewMode(true);
     },
 
     /**
      * @return {!Array.<!Element>}
      */
     statusBarItems: function()
     {
         return [
             this._recordButton.element,
             this._clearButton.element,
@@ skipping 722 matching lines @@
             if (request.loaderId === loaderId)
                 requestsToPick.push(request);
         }
 
         this._reset();
 
         for (var i = 0; i < requestsToPick.length; ++i)
             this._appendRequest(requestsToPick[i]);
     },
 
-    switchToDetailedView: function()
-    {
-        if (!this._dataGrid)
+    /**
+     * @param {boolean} detailed
+     */
+    switchViewMode: function(detailed) {

[vsevik, 2014/08/14 11:12:44]

{ on the next line

[eustas, 2014/08/14 11:32:05]

Done.

+        if (this._detailedMode === detailed)
             return;
-        if (this._dataGrid.selectedNode)
-            this._dataGrid.selectedNode.selected = false;
+        this._detailedMode = detailed;
 
-        this.element.classList.remove("brief-mode");
-        this._detailedMode = true;
+        if (detailed) {
+            if (this._dataGrid.selectedNode)
+                this._dataGrid.selectedNode.selected = false;
+        } else {
+            this._removeAllNodeHighlights();
+            this._popoverHelper.hidePopover();
+        }
+
+        this.element.classList.toggle("brief-mode", !detailed);
         this._updateColumns();
     },
 
-    switchToBriefView: function()
-    {
-        this.element.classList.add("brief-mode");
-        this._removeAllNodeHighlights();
-        this._detailedMode = false;
-        this._updateColumns();
-        this._popoverHelper.hidePopover();
-    },
-
     _toggleLargerRequests: function()
     {
         WebInspector.settings.resourcesLargeRows.set(!WebInspector.settings.resourcesLargeRows.get());
         this._updateRowsSize();
     },
 
     /**
      * @return {number}
      */
     rowHeight: function()
@@ skipping 353 matching lines @@
             this._currentMatchedRequestNode = null;
             return;
         }
 
         var request = node._request;
         var regExp = this._searchRegExp;
         var nameMatched = request.name().match(regExp);
         var pathMatched = request.path().match(regExp);
         if (!nameMatched && pathMatched && !this._largerRequestsButton.toggled)
             this._toggleLargerRequests();
+        if (reveal)
+            WebInspector.Revealer.reveal(request);
         var highlightedSubstringChanges = node._highlightMatchedSubstring(regExp);
         this._highlightedSubstringChanges.push(highlightedSubstringChanges);
-        if (reveal)
-            WebInspector.Revealer.reveal(node);
 
         this._currentMatchedRequestNode = node;
         this._currentMatchedRequestIndex = n;
         this.dispatchEventToListeners(WebInspector.NetworkLogView.EventTypes.SearchIndexUpdated, n);
     },
 
     /**
      * @param {string} query
      * @param {boolean} shouldJump
      * @param {boolean=} jumpBackwards
@@ skipping 154 matching lines @@
 
     /**
      * @param {!WebInspector.NetworkRequest} request
      */
     revealAndHighlightRequest: function(request)
     {
         this._removeAllNodeHighlights();
 
         var node = this._nodesByRequestId.get(request.requestId);
         if (node) {
-            this._dataGrid.element.focus();
             node.reveal();
             this._highlightNode(node);
         }
     },
 
     _removeAllNodeHighlights: function()
     {
         if (this._highlightedNode) {
             this._highlightedNode.element().classList.remove("highlighted-row");
             delete this._highlightedNode;
@@ skipping 478 matching lines @@
     },
 
     _toggleGridMode: function()
     {
         if (this._viewingRequestMode) {
             this._viewingRequestMode = false;
             this.element.classList.remove("viewing-resource");
             this._splitView.hideMain();
         }
 
-        this._networkLogView.switchToDetailedView();
+        this._networkLogView.switchViewMode(true);
         this._networkLogView.setAllowPopover(true);
         this._networkLogView._allowRequestSelection = false;
     },
 
     _toggleViewingRequestMode: function()
     {
         if (this._viewingRequestMode)
             return;
         this._viewingRequestMode = true;
 
         this.element.classList.add("viewing-resource");
         this._splitView.showBoth();
         this._networkLogView.setAllowPopover(false);
         this._networkLogView._allowRequestSelection = true;
-        this._networkLogView.switchToBriefView();
+        this._networkLogView.switchViewMode(false);
     },
 
     /**
      * @param {string} query
      * @param {boolean} shouldJump
      * @param {boolean=} jumpBackwards
      */
     performSearch: function(query, shouldJump, jumpBackwards)
     {
         this._networkLogView.performSearch(query, shouldJump, jumpBackwards);
@@ skipping 90 matching lines @@
  * @constructor
  * @implements {WebInspector.Revealer}
  */
 WebInspector.NetworkPanel.RequestRevealer = function()
 {
 }
 
 WebInspector.NetworkPanel.RequestRevealer.prototype = {
     /**
      * @param {!Object} request
+     * @param {number=} lineNumber
      */
-    reveal: function(request)
+    reveal: function(request, lineNumber)
     {
         if (request instanceof WebInspector.NetworkRequest) {
             var panel = /** @type {?WebInspector.NetworkPanel} */ (WebInspector.inspectorView.showPanel("network"));
             if (panel)
                 panel.revealAndHighlightRequest(request);
         }
     }
 }
 
 /**
@@ skipping 442 matching lines @@
             action: WebInspector.UserMetrics.UserActionNames.NetworkRequestSelected,
             url: this._request.url
         });
     },
 
     /**
      * @param {!RegExp=} regexp
      */
     _highlightMatchedSubstring: function(regexp)
     {
+        // Ensure element is created.
+        this.element();
         var domChanges = [];
-        var matchInfo = this._element.textContent.match(regexp);
+        var matchInfo = this._nameCell.textContent.match(regexp);
         if (matchInfo)
             WebInspector.highlightSearchResult(this._nameCell, matchInfo.index, matchInfo[0].length, domChanges);
         return domChanges;
     },
 
     _openInNewTab: function()
     {
         InspectorFrontendHost.openInNewTab(this._request.url);
     },
 
@@ skipping 415 matching lines @@
 WebInspector.NetworkDataGridNode.RequestPropertyComparator = function(propertyName, revert, a, b)
 {
     var aValue = a._request[propertyName];
     var bValue = b._request[propertyName];
     if (aValue > bValue)
         return revert ? -1 : 1;
     if (bValue > aValue)
         return revert ? 1 : -1;
     return a._request.indentityCompare(b._request);
 }