DevTools: NetworkPanel: get rid of getters/setters.

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 58 matching lines @@
     /** @type {!Array.<!WebInspector.NetworkLogView.Filter>} */
     this._filters = [];
 
     this._currentMatchedRequestNode = null;
     this._currentMatchedRequestIndex = -1;
 
     this._createStatusbarButtons();
     this._createStatusBarItems();
     this._linkifier = new WebInspector.Linkifier();
 
+    this._allowPopover = true;
+
     this._addFilters();
     this._resetSuggestionBuilder();
     this._initializeView();
     this._recordButton.toggled = true;
 
     WebInspector.targetManager.observeTargets(this);
     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);
 
@@ skipping 94 matching lines @@
 
     _initializeView: function()
     {
         this.element.id = "network-container";
 
         this._createSortingFunctions();
         this._createTable();
         this._createTimelineGrid();
         this._summaryBarElement = this.element.createChild("div", "network-summary-bar");
 
-        if (!this.useLargeRows)
-            this._setLargerRequests(this.useLargeRows);
+        if (!this.usesLargeRows())
+            this._setLargerRequests(false);
 
-        this._allowPopover = true;
         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.calculator = new WebInspector.NetworkTransferTimeCalculator();
+        this._setCalculator(new WebInspector.NetworkTransferTimeCalculator());
 
         this.switchToDetailedView();
     },
 
-    get statusBarItems()
+    /**
+     * @return {!Array.<!Element>}
+     */
+    statusBarItems: function()
     {
         return [
             this._recordButton.element,
             this._clearButton.element,
             this._filterBar.filterButton().element,
             this._largerRequestsButton.element,
             this._preserveLogCheckbox.element,
             this._disableCacheCheckbox.element,
             this._progressBarContainer];
     },
 
-    get useLargeRows()
+    /**
+     * @return {boolean}
+     */
+    usesLargeRows: function()
     {
-        return WebInspector.settings.resourcesLargeRows.get();
+        return !!WebInspector.settings.resourcesLargeRows.get();
     },
 
-    set allowPopover(flag)
+    /**
+     * @param {boolean} flag
+     */
+    setAllowPopover: function(flag)
     {
         this._allowPopover = flag;
     },
 
     /**
      * @return {!Array.<!Element>}
      */
     elementsToRestoreScrollPositionsFor: function()
     {
         if (!this._dataGrid) // Not initialized yet.
@@ skipping 261 matching lines @@
         this._removeAllNodeHighlights();
         var selectedIndex = this._timelineSortSelector.selectedIndex;
         if (!selectedIndex)
             selectedIndex = 1; // Sort by start time by default.
         var selectedOption = this._timelineSortSelector[selectedIndex];
         var value = selectedOption.value;
 
         var sortingFunction = this._sortingFunctions[value];
         this._dataGrid.sortNodes(sortingFunction);
         this._highlightNthMatchedRequestForSearch(this._updateMatchCountAndFindMatchIndex(this._currentMatchedRequestNode), false);
-        this.calculator = this._calculators[value];
-        if (this.calculator.startAtZero)
+        var calculator = this._calculators[value];
+        this._setCalculator(calculator);
+        if (calculator.startAtZero)
             this._timelineGrid.hideEventDividers();
         else
             this._timelineGrid.showEventDividers();
         this._dataGrid.markColumnAsSortedBy("timeline", WebInspector.DataGrid.Order.Ascending);
     },
 
     _createStatusBarItems: function()
     {
         this._progressBarContainer = document.createElement("div");
         this._progressBarContainer.className = "status-bar-item";
@@ skipping 66 matching lines @@
 
     _updateDividersIfNeeded: function()
     {
         if (!this._dataGrid)
             return;
         var timelineOffset = this._dataGrid.columnOffset("timeline");
         // Position timline grid location.
         if (timelineOffset)
             this._timelineGrid.element.style.left = timelineOffset + "px";
 
+        var calculator = this.calculator();
         var proceed = true;
         if (!this.isShowing()) {
             this._scheduleRefresh();
             proceed = false;
         } else {
-            this.calculator.setDisplayWindow(this._timelineGrid.dividersElement.clientWidth);
-            proceed = this._timelineGrid.updateDividers(this.calculator);
+            calculator.setDisplayWindow(this._timelineGrid.dividersElement.clientWidth);
+            proceed = this._timelineGrid.updateDividers(calculator);
         }
         if (!proceed)
             return;
 
-        if (this.calculator.startAtZero || !this.calculator.computePercentageFromEventTime) {
+        if (calculator.startAtZero || !calculator.computePercentageFromEventTime) {
             // If our current sorting method starts at zero, that means it shows all
             // requests starting at the same point, and so onLoad event and DOMContent
             // event lines really wouldn't make much sense here, so don't render them.
             // Additionally, if the calculator doesn't have the computePercentageFromEventTime
             // function defined, we are probably sorting by size, and event times aren't relevant
             // in this case.
             return;
         }
 
         this._timelineGrid.removeEventDividers();
         if (this._mainRequestLoadTime !== -1) {
-            var percent = this.calculator.computePercentageFromEventTime(this._mainRequestLoadTime);
+            var percent = calculator.computePercentageFromEventTime(this._mainRequestLoadTime);
 
             var loadDivider = document.createElement("div");
             loadDivider.className = "network-event-divider network-red-divider";
 
             var loadDividerPadding = document.createElement("div");
             loadDividerPadding.className = "network-event-divider-padding";
             loadDividerPadding.title = WebInspector.UIString("Load event");
             loadDividerPadding.appendChild(loadDivider);
             loadDividerPadding.style.left = percent + "%";
             this._timelineGrid.addEventDivider(loadDividerPadding);
         }
 
         if (this._mainRequestDOMContentLoadedTime !== -1) {
-            var percent = this.calculator.computePercentageFromEventTime(this._mainRequestDOMContentLoadedTime);
+            var percent = calculator.computePercentageFromEventTime(this._mainRequestDOMContentLoadedTime);
 
             var domContentLoadedDivider = document.createElement("div");
             domContentLoadedDivider.className = "network-event-divider network-blue-divider";
 
             var domContentLoadedDividerPadding = document.createElement("div");
             domContentLoadedDividerPadding.className = "network-event-divider-padding";
             domContentLoadedDividerPadding.title = WebInspector.UIString("DOMContentLoaded event");
             domContentLoadedDividerPadding.appendChild(domContentLoadedDivider);
             domContentLoadedDividerPadding.style.left = percent + "%";
             this._timelineGrid.addEventDivider(domContentLoadedDividerPadding);
         }
     },
 
     _refreshIfNeeded: function()
     {
         if (this._needsRefresh)
             this.refresh();
     },
 
     _invalidateAllItems: function()
     {
         var requestIds = this._nodesByRequestId.keys();
         for (var i = 0; i < requestIds.length; ++i)
             this._staleRequestIds[requestIds[i]] = true;
     },
 
-    get calculator()
+    /**
+     * @return {!WebInspector.NetworkBaseCalculator}
+     */
+    calculator: function()
     {
         return this._calculator;
     },
 
-    set calculator(x)
+    /**
+     * @param {!WebInspector.NetworkBaseCalculator} x
+     */
+    _setCalculator: function(x)
     {
         if (!x || this._calculator === x)
             return;
 
         this._calculator = x;
         this._calculator.reset();
 
         this._invalidateAllItems();
         this.refresh();
     },
@@ skipping 57 matching lines @@
     {
         this._needsRefresh = false;
         if (this._refreshTimeout) {
             clearTimeout(this._refreshTimeout);
             delete this._refreshTimeout;
         }
 
         this._removeAllNodeHighlights();
         var wasScrolledToLastRow = this._dataGrid.isScrolledToLastRow();
         var boundariesChanged = false;
-        if (this.calculator.updateBoundariesForEventTime) {
-            boundariesChanged = this.calculator.updateBoundariesForEventTime(this._mainRequestLoadTime) || boundariesChanged;
-            boundariesChanged = this.calculator.updateBoundariesForEventTime(this._mainRequestDOMContentLoadedTime) || boundariesChanged;
+        var calculator = this.calculator();
+        if (calculator.updateBoundariesForEventTime) {
+            boundariesChanged = calculator.updateBoundariesForEventTime(this._mainRequestLoadTime) || boundariesChanged;
+            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)
                 rootNode.removeChild(node);
             node._isFilteredOut = !this._applyFilter(node);
             if (!node._isFilteredOut)
                 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);
-            if (this.calculator.updateBoundaries(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.values();
             for (var i = 0; i < nodes.length; ++i)
-                nodes[i].refreshGraph(this.calculator);
+                nodes[i].refreshGraph(calculator);
         }
 
         this._staleRequestIds = {};
         this._updateSummaryBar();
         if (wasScrolledToLastRow)
             this._dataGrid.scrollToLastRow();
     },
 
     _onRecordButtonClicked: function()
     {
@@ skipping 988 matching lines @@
     for (var columnId in defaultColumnsVisibility)
         columnsVisibility[columnId] = savedColumnsVisibility.hasOwnProperty(columnId) ? savedColumnsVisibility[columnId] : defaultColumnsVisibility[columnId];
     networkLogColumnsVisibilitySetting.set(columnsVisibility);
 
     this._networkLogView = new WebInspector.NetworkLogView(this._filterBar, networkLogColumnsVisibilitySetting);
     this._networkLogView.show(this._splitView.sidebarElement());
 
     var viewsContainerView = new WebInspector.VBox();
     this._viewsContainerElement = viewsContainerView.element;
     this._viewsContainerElement.id = "network-views";
-    if (!this._networkLogView.useLargeRows)
+    if (!this._networkLogView.usesLargeRows())
         this._viewsContainerElement.classList.add("small");
     viewsContainerView.show(this._splitView.mainElement());
 
     this._networkLogView.addEventListener(WebInspector.NetworkLogView.EventTypes.ViewCleared, this._onViewCleared, this);
     this._networkLogView.addEventListener(WebInspector.NetworkLogView.EventTypes.RowSizeChanged, this._onRowSizeChanged, this);
     this._networkLogView.addEventListener(WebInspector.NetworkLogView.EventTypes.RequestSelected, this._onRequestSelected, this);
     this._networkLogView.addEventListener(WebInspector.NetworkLogView.EventTypes.SearchCountUpdated, this._onSearchCountUpdated, this);
     this._networkLogView.addEventListener(WebInspector.NetworkLogView.EventTypes.SearchIndexUpdated, this._onSearchIndexUpdated, this);
 
     this._closeButtonElement = this._viewsContainerElement.createChild("div", "close-button");
     this._closeButtonElement.id = "network-close-button";
     this._closeButtonElement.addEventListener("click", this._toggleGridMode.bind(this), false);
     this._viewsContainerElement.appendChild(this._closeButtonElement);
 
-    for (var i = 0; i < this._networkLogView.statusBarItems.length; ++i)
-        this._panelStatusBarElement.appendChild(this._networkLogView.statusBarItems[i]);
+    var statusBarItems = this._networkLogView.statusBarItems();
+    for (var i = 0; i < statusBarItems.length; ++i)
+        this._panelStatusBarElement.appendChild(statusBarItems[i]);
 
     /**
      * @this {WebInspector.NetworkPanel}
      * @return {?WebInspector.SourceFrame}
      */
     function sourceFrameGetter()
     {
         return this._networkItemView.currentSourceFrame();
     }
     WebInspector.GoToLineDialog.install(this, sourceFrameGetter.bind(this));
@@ skipping 155 matching lines @@
 
     _toggleGridMode: function()
     {
         if (this._viewingRequestMode) {
             this._viewingRequestMode = false;
             this.element.classList.remove("viewing-resource");
             this._splitView.hideMain();
         }
 
         this._networkLogView.switchToDetailedView();
-        this._networkLogView.allowPopover = 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.allowPopover = false;
+        this._networkLogView.setAllowPopover(false);
         this._networkLogView._allowRequestSelection = true;
         this._networkLogView.switchToBriefView();
     },
 
     /**
      * @param {string} query
      * @param {boolean} shouldJump
      * @param {boolean=} jumpBackwards
      */
     performSearch: function(query, shouldJump, jumpBackwards)
@@ skipping 503 matching lines @@
         element.classList.toggle("network-error-row", this._isFailed());
         element.classList.toggle("resource-cached", this._request.cached);
         var typeClassName = "network-type-" + this._request.type.name();
         if (!element.classList.contains(typeClassName)) {
             element.removeMatchingStyleClasses("network-type-\\w+");
             element.classList.add(typeClassName);
         }
 
         WebInspector.SortableDataGridNode.prototype.createCells.call(this);
 
-        this.refreshGraph(this._parentView.calculator);
+        this.refreshGraph(this._parentView.calculator());
     },
 
     /**
      * @override
      * @param {string} columnIdentifier
      * @return {!Element}
      */
     createCell: function(columnIdentifier)
     {
         var cell = this.createTD(columnIdentifier);
@@ skipping 494 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);
 }