DevTools: NetworkPanel: tune members visibility.

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 26 matching lines @@
  * @param {!WebInspector.Setting} coulmnsVisibilitySetting
  */
 WebInspector.NetworkLogView = function(filterBar, coulmnsVisibilitySetting)
 {
     WebInspector.VBox.call(this);
     this.registerRequiredCSS("network/networkLogView.css");
     this.registerRequiredCSS("ui/filter.css");
 
     this._filterBar = filterBar;
     this._coulmnsVisibilitySetting = coulmnsVisibilitySetting;
-    this._allowRequestSelection = false;
     /** @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;
     this._highlightedSubstringChanges = [];
@@ skipping 22 matching lines @@
     WebInspector.targetManager.addModelListener(WebInspector.NetworkManager, WebInspector.NetworkManager.EventTypes.RequestStarted, this._onRequestStarted, this);
     WebInspector.targetManager.addModelListener(WebInspector.NetworkManager, WebInspector.NetworkManager.EventTypes.RequestUpdated, this._onRequestUpdated, this);
     WebInspector.targetManager.addModelListener(WebInspector.NetworkManager, WebInspector.NetworkManager.EventTypes.RequestFinished, this._onRequestUpdated, this);
 
     WebInspector.targetManager.addModelListener(WebInspector.ResourceTreeModel, WebInspector.ResourceTreeModel.EventTypes.WillReloadPage, this._willReloadPage, this);
     WebInspector.targetManager.addModelListener(WebInspector.ResourceTreeModel, WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this);
     WebInspector.targetManager.addModelListener(WebInspector.ResourceTreeModel, WebInspector.ResourceTreeModel.EventTypes.Load, this._loadEventFired, this);
     WebInspector.targetManager.addModelListener(WebInspector.ResourceTreeModel, WebInspector.ResourceTreeModel.EventTypes.DOMContentLoaded, this._domContentLoadedEventFired, this);
 }
 
+WebInspector.NetworkLogView._isFilteredOutSymbol = Symbol("isFilteredOut");
+WebInspector.NetworkLogView._isMatchingSearchQuerySymbol = Symbol("isMatchingSearchQuery");
+
 WebInspector.NetworkLogView.HTTPSchemas = {"http": true, "https": true, "ws": true, "wss": true};
 WebInspector.NetworkLogView._responseHeaderColumns = ["Cache-Control", "Connection", "Content-Encoding", "Content-Length", "ETag", "Keep-Alive", "Last-Modified", "Server", "Vary"];
 WebInspector.NetworkLogView.defaultColumnsVisibility = {
     method: true, status: true, scheme: false, domain: false, remoteAddress: false, type: true, initiator: true, cookies: false, setCookies: false, size: true, time: true, connectionId: false,
     "Cache-Control": false, "Connection": false, "Content-Encoding": false, "Content-Length": false, "ETag": false, "Keep-Alive": false, "Last-Modified": false, "Server": false, "Vary": false
 };
 WebInspector.NetworkLogView._defaultRefreshDelay = 500;
 
 /** @enum {string} */
 WebInspector.NetworkLogView.FilterType = {
@@ skipping 60 matching lines @@
      */
     targetRemoved: function(target)
     {
     },
 
     /**
      * @return {boolean}
      */
     allowRequestSelection: function()
     {
-        return this._allowRequestSelection;
+        return !this._allowPopover;

[vsevik, 2014/11/14 10:52:59]

This is not semantically correct. allowPopover and allowRequestSelection are not
required to be mutually exclusive an dthis could be changed later. Let's keep
both flags.

[eustas, 2014/11/14 12:02:43]

Fixed. Removed allowPopover

     },
 
     _addFilters: function()
     {
         this._textFilterUI = new WebInspector.TextFilterUI();
         this._textFilterUI.addEventListener(WebInspector.FilterUI.Events.FilterChanged, this._filterChanged, this);
         this._filterBar.addFilter(this._textFilterUI);
 
         var types = [];
         for (var typeId in WebInspector.resourceTypes) {
@@ skipping 403 matching lines @@
         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]._isFilteredOut) {
+            if (!nodes[i][WebInspector.NetworkLogView._isFilteredOutSymbol]) {
                 selectedRequestsNumber++;
                 selectedTransferSize += requestTransferSize;
             }
             if (request.url === request.target().resourceTreeModel.inspectedPageURL())
                 baseTime = request.startTime;
             if (request.endTime > maxTime)
                 maxTime = request.endTime;
         }
         var text = "";
         if (selectedRequestsNumber !== requestsNumber) {
@@ skipping 184 matching lines @@
             boundariesChanged = calculator.updateBoundariesForEventTime(this._mainRequestDOMContentLoadedTime) || boundariesChanged;
         }
 
         var dataGrid = this._dataGrid;
         var rootNode = dataGrid.rootNode();
         var nodesToInsert = [];
         for (var requestId in this._staleRequestIds) {
             var node = this._nodesByRequestId.get(requestId);
             if (!node)
                 continue;
-            if (!node._isFilteredOut)
+            if (!node[WebInspector.NetworkLogView._isFilteredOutSymbol])
                 rootNode.removeChild(node);
-            node._isFilteredOut = !this._applyFilter(node);
-            if (!node._isFilteredOut)
+            node[WebInspector.NetworkLogView._isFilteredOutSymbol] = !this._applyFilter(node);
+            if (!node[WebInspector.NetworkLogView._isFilteredOutSymbol])
                 nodesToInsert.push(node);
         }
 
         for (var i = 0; i < nodesToInsert.length; ++i) {
             var node = nodesToInsert[i];
             var request = node.request();
             node.refresh();
             dataGrid.insertChild(node);
-            node._isMatchingSearchQuery = this._matchRequest(request);
+            node[WebInspector.NetworkLogView._isMatchingSearchQuerySymbol] = this._matchRequest(request);
             if (calculator.updateBoundaries(request))
                 boundariesChanged = true;
         }
 
         this._highlightNthMatchedRequestForSearch(this._updateMatchCountAndFindMatchIndex(this._currentMatchedRequestNode), false);
 
         if (boundariesChanged) {
             // The boundaries changed, so all item graphs are stale.
             this._updateDividersIfNeeded();
             var nodes = this._nodesByRequestId.valuesArray();
@@ skipping 60 matching lines @@
             this._appendRequest(request);
         }
     },
 
     /**
      * @param {!WebInspector.NetworkRequest} request
      */
     _appendRequest: function(request)
     {
         var node = new WebInspector.NetworkDataGridNode(this, request);
+        node[WebInspector.NetworkLogView._isFilteredOutSymbol] = true;
+        node[WebInspector.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);
         this._nodesByRequestId.set(request.requestId, node);
 
         // Pull all the redirects of the main request upon commit load.
         if (request.redirects) {
@@ skipping 448 matching lines @@
      */
     _highlightNthMatchedRequestForSearch: function(n, reveal)
     {
         this._removeAllHighlights();
 
         /** @type {!Array.<!WebInspector.NetworkDataGridNode>} */
         var nodes = this._dataGrid.rootNode().children;
         var matchCount = 0;
         var node = null;
         for (var i = 0; i < nodes.length; ++i) {
-            if (nodes[i]._isMatchingSearchQuery) {
+            if (nodes[i][WebInspector.NetworkLogView._isMatchingSearchQuerySymbol]) {
                 if (matchCount === n) {
                     node = nodes[i];
                     break;
                 }
                 matchCount++;
             }
         }
         if (!node) {
             this._currentMatchedRequestNode = null;
             return;
@@ skipping 23 matching lines @@
     performSearch: function(searchConfig, shouldJump, jumpBackwards)
     {
         var query = searchConfig.query;
         var currentMatchedRequestNode = this._currentMatchedRequestNode;
         this._clearSearchMatchedList();
         this._searchRegExp = createPlainTextSearchRegex(query, "i");
 
         /** @type {!Array.<!WebInspector.NetworkDataGridNode>} */
         var nodes = this._dataGrid.rootNode().children;
         for (var i = 0; i < nodes.length; ++i)
-            nodes[i]._isMatchingSearchQuery = this._matchRequest(nodes[i].request());
+            nodes[i][WebInspector.NetworkLogView._isMatchingSearchQuerySymbol] = this._matchRequest(nodes[i].request());
         var newMatchedRequestIndex = this._updateMatchCountAndFindMatchIndex(currentMatchedRequestNode);
         if (!newMatchedRequestIndex && jumpBackwards)
             newMatchedRequestIndex = this._matchedRequestCount - 1;
         this._highlightNthMatchedRequestForSearch(newMatchedRequestIndex, shouldJump);
     },
 
     /**
      * @return {boolean}
      */
     supportsCaseSensitiveSearch: function()
@@ skipping 13 matching lines @@
      * @param {?WebInspector.NetworkDataGridNode} node
      * @return {number}
      */
     _updateMatchCountAndFindMatchIndex: function(node)
     {
         /** @type {!Array.<!WebInspector.NetworkDataGridNode>} */
         var nodes = this._dataGrid.rootNode().children;
         var matchCount = 0;
         var matchIndex = 0;
         for (var i = 0; i < nodes.length; ++i) {
-            if (!nodes[i]._isMatchingSearchQuery)
+            if (!nodes[i][WebInspector.NetworkLogView._isMatchingSearchQuerySymbol])
                 continue;
             if (node === nodes[i])
                 matchIndex = matchCount;
             matchCount++;
         }
         if (this._matchedRequestCount !== matchCount) {
             this._matchedRequestCount = matchCount;
             this.dispatchEventToListeners(WebInspector.NetworkLogView.EventTypes.SearchCountUpdated, matchCount);
         }
         return matchIndex;
@@ skipping 655 matching lines @@
     _toggleGridMode: function()
     {
         if (this._viewingRequestMode) {
             this._viewingRequestMode = false;
             this.element.classList.remove("viewing-resource");
             this._splitView.hideMain();
         }
 
         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.switchViewMode(false);
     },
 
     /**
      * @param {!WebInspector.SearchableView.SearchConfig} searchConfig
      * @param {boolean} shouldJump
      * @param {boolean=} jumpBackwards
      */
     performSearch: function(searchConfig, shouldJump, jumpBackwards)
     {
@@ skipping 468 matching lines @@
  * @extends {WebInspector.SortableDataGridNode}
  * @param {!WebInspector.NetworkLogView} parentView
  * @param {!WebInspector.NetworkRequest} request
  */
 WebInspector.NetworkDataGridNode = function(parentView, request)
 {
     WebInspector.SortableDataGridNode.call(this, {});
     this._parentView = parentView;
     this._request = request;
     this._linkifier = new WebInspector.Linkifier();
-    this._isFilteredOut = true;
-    this._isMatchingSearchQuery = false;
     this._staleGraph = true;
 }
 
 WebInspector.NetworkDataGridNode._hoveredRowSymbol = Symbol("hoveredRow");
 
 WebInspector.NetworkDataGridNode.prototype = {
     /**
      * @return {!WebInspector.NetworkRequest}
      */
     request: function()
@@ skipping 675 matching lines @@
             this._writeProgress.done();
             return;
         }
         const chunkSize = 100000;
         var text = this._text.substring(this._bytesWritten, this._bytesWritten + chunkSize);
         this._bytesWritten += text.length;
         stream.write(text, this._writeNextChunk.bind(this));
         this._writeProgress.setWorked(this._bytesWritten);
     }
 }