Merge 77623 - 2011-02-04 Pavel Feldman <pfeldman@chromium.org>...

Source/WebCore/inspector/front-end/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 296 matching lines @@
         if (columnIdentifier === "timeline") {
             this._sortByTimeline();
             return;
         }
         var sortingFunction = this._sortingFunctions[columnIdentifier];
         if (!sortingFunction)
             return;
 
         this._dataGrid.sortNodes(sortingFunction, this._dataGrid.sortOrder === "descending");
         this._timelineSortSelector.selectedIndex = 0;
+        this._updateOffscreenRows();
     },
 
     _sortByTimeline: function()
     {
         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.calculator = this._calculators[value];
         if (this.calculator.startAtZero)
             this._timelineGrid.hideEventDividers();
         else
             this._timelineGrid.showEventDividers();
         this._dataGrid.markColumnAsSortedBy("timeline", "ascending");
+        this._updateOffscreenRows();
     },
 
     _createFilterStatusBarItems: function()
     {
         var filterBarElement = document.createElement("div");
         filterBarElement.className = "scope-bar status-bar-item";
         filterBarElement.id = "network-filter";
 
         function createFilterElement(category, label)
         {
@@ skipping 138 matching lines @@
             // If selectMultiple is turned on, and we were selected, we just
             // want to unselect ourselves.
             target.removeStyleClass("selected");
             this._hideCategory(target.category);
         } else {
             // If selectMultiple is turned on, and we weren't selected, we just
             // want to select ourselves.
             target.addStyleClass("selected");
             this._showCategory(target.category);
         }
+        this._updateOffscreenRows();
     },
 
     _scheduleRefresh: function()
     {
         if (this._needsRefresh)
             return;
 
         this._needsRefresh = true;
 
         if (this.visible && !("_refreshTimeout" in this))
@@ skipping 530 matching lines @@
     {
         var dataTableBody = this._dataGrid.dataTableBody;
         var rows = dataTableBody.children;
         var recordsCount = rows.length;
         if (recordsCount < 2)
             return;  // Filler row only.
 
         var visibleTop = this._dataGrid.scrollContainer.scrollTop;
         var visibleBottom = visibleTop + this._dataGrid.scrollContainer.offsetHeight;
 
-        var rowHeight = rows[0].offsetHeight;
+        var rowHeight = 0;
 
         // Filler is at recordsCount - 1.
+        var unfilteredRowIndex = 0;
         for (var i = 0; i < recordsCount - 1; ++i) {
             var row = rows[i];
             // Don't touch summaty - quit instead.
-            if (row === this._summaryBarRowNode)
+            if (this._summaryBarRowNode && row === this._summaryBarRowNode.element)
                 break;
-            var rowIsVisible = i * rowHeight < visibleBottom && (i + 1) * rowHeight > visibleTop;
+
+            var dataGridNode = this._dataGrid.dataGridNodeFromNode(row);
+            if (dataGridNode.isFilteredOut()) {
+                row.removeStyleClass("offscreen");
+                continue;
+            }
+
+            if (!rowHeight)
+                rowHeight = row.offsetHeight;
+
+            var rowIsVisible = unfilteredRowIndex * rowHeight < visibleBottom && (unfilteredRowIndex + 1) * rowHeight > visibleTop;
             if (rowIsVisible !== row.rowIsVisible) {
                 if (rowIsVisible)
                     row.removeStyleClass("offscreen");
                 else
                     row.addStyleClass("offscreen");
                 row.rowIsVisible = rowIsVisible;
             }
+            unfilteredRowIndex++;
         }
     }
 }
 
 WebInspector.NetworkPanel.prototype.__proto__ = WebInspector.Panel.prototype;
 
 WebInspector.NetworkBaseCalculator = function()
 {
 }
 
@@ skipping 288 matching lines @@
         this._nameCell = this._createDivInTD("name");
         this._methodCell = this._createDivInTD("method");
         this._statusCell = this._createDivInTD("status");
         this._typeCell = this._createDivInTD("type");
         this._sizeCell = this._createDivInTD("size");
         this._timeCell = this._createDivInTD("time");
         this._createTimelineCell();
         this._nameCell.addEventListener("click", this.select.bind(this), false);
     },
 
+    isFilteredOut: function()
+    {
+        if (!this._panel._hiddenCategories.all)
+            return false;
+        return this._resource.category.name in this._panel._hiddenCategories;
+    },
+
     select: function()
     {
         this._panel._showResource(this._resource);
         WebInspector.DataGridNode.prototype.select.apply(this, arguments);
     },
 
     get selectable()
     {
         if (!this._panel._viewingResourceMode)
             return false;
-        if (!this._panel._hiddenCategories.all)
-            return true;
-        if (this._panel._hiddenCategories[this._resource.category.name])
-            return false;
-        return true;
+        return !this.isFilteredOut();
     },
 
     _createDivInTD: function(columnIdentifier)
     {
         var td = document.createElement("td");
         td.className = columnIdentifier + "-column";
         var div = document.createElement("div");
         td.appendChild(div);
         this._element.appendChild(td);
         return div;
@@ skipping 296 matching lines @@
 
 WebInspector.NetworkDataGridNode.prototype.__proto__ = WebInspector.DataGridNode.prototype;
 
 WebInspector.NetworkTotalGridNode = function(element)
 {
     this._summaryBarElement = element;
     WebInspector.DataGridNode.call(this, {summaryRow: true});
 }
 
 WebInspector.NetworkTotalGridNode.prototype = {
+    isFilteredOut: function()
+    {
+        return false;
+    },
+
+    get selectable()
+    {
+        return false;
+    },
+
     createCells: function()
     {
         var td = document.createElement("td");
         td.setAttribute("colspan", 7);
         td.className = "network-summary";
         td.appendChild(this._summaryBarElement);
         this._element.appendChild(td);
     }
 }
 
 WebInspector.NetworkTotalGridNode.prototype.__proto__ = WebInspector.DataGridNode.prototype;