Title: [92780] trunk/Source/WebCore
- Revision
- 92780
- Author
- vse...@chromium.org
- Date
- 2011-08-10 11:41:03 -0700 (Wed, 10 Aug 2011)
Log Message
Web Inspector: [Network] Filtering by stylesheet does not update the # reqs, filesizes.
https://bugs.webkit.org/show_bug.cgi?id=65515
Reviewed by Pavel Feldman.
* English.lproj/localizedStrings.js:
* inspector/front-end/NetworkPanel.js:
(WebInspector.NetworkLogView.prototype._updateSummaryBar):
(WebInspector.NetworkLogView.prototype._updateFilter):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (92779 => 92780)
--- trunk/Source/WebCore/ChangeLog 2011-08-10 18:37:58 UTC (rev 92779)
+++ trunk/Source/WebCore/ChangeLog 2011-08-10 18:41:03 UTC (rev 92780)
@@ -1,5 +1,17 @@
2011-08-10 Vsevolod Vlasov <vse...@chromium.org>
+ Web Inspector: [Network] Filtering by stylesheet does not update the # reqs, filesizes.
+ https://bugs.webkit.org/show_bug.cgi?id=65515
+
+ Reviewed by Pavel Feldman.
+
+ * English.lproj/localizedStrings.js:
+ * inspector/front-end/NetworkPanel.js:
+ (WebInspector.NetworkLogView.prototype._updateSummaryBar):
+ (WebInspector.NetworkLogView.prototype._updateFilter):
+
+2011-08-10 Vsevolod Vlasov <vse...@chromium.org>
+
Web Inspector: console messages markers are lost in Resources panel after page reload
https://bugs.webkit.org/show_bug.cgi?id=60701
Modified: trunk/Source/WebCore/English.lproj/localizedStrings.js
(Binary files differ)
Modified: trunk/Source/WebCore/inspector/front-end/NetworkPanel.js (92779 => 92780)
--- trunk/Source/WebCore/inspector/front-end/NetworkPanel.js 2011-08-10 18:37:58 UTC (rev 92779)
+++ trunk/Source/WebCore/inspector/front-end/NetworkPanel.js 2011-08-10 18:41:03 UTC (rev 92780)
@@ -366,9 +366,9 @@
_updateSummaryBar: function()
{
- var numRequests = this._resources.length;
+ var requestsNumber = this._resources.length;
- if (!numRequests) {
+ if (!requestsNumber) {
if (this._summaryBarElement._isDisplayingWarning)
return;
this._summaryBarElement._isDisplayingWarning = true;
@@ -384,18 +384,31 @@
delete this._summaryBarElement._isDisplayingWarning;
var transferSize = 0;
+ var selectedRequestsNumber = 0;
+ var selectedTransferSize = 0;
var baseTime = -1;
var maxTime = -1;
for (var i = 0; i < this._resources.length; ++i) {
var resource = this._resources[i];
- transferSize += (resource.cached || !resource.transferSize) ? 0 : resource.transferSize;
+ var resourceTransferSize = (resource.cached || !resource.transferSize) ? 0 : resource.transferSize;
+ transferSize += resourceTransferSize;
+ if (!this._hiddenCategories.all || !this._hiddenCategories[resource.category.name]) {
+ selectedRequestsNumber++;
+ selectedTransferSize += resourceTransferSize;
+ }
if (resource === WebInspector.mainResource)
baseTime = resource.startTime;
if (resource.endTime > maxTime)
maxTime = resource.endTime;
}
- var text = String.sprintf(WebInspector.UIString("%d requests"), numRequests);
- text += " \u2758 " + String.sprintf(WebInspector.UIString("%s transferred"), Number.bytesToString(transferSize));
+ var text = "";
+ if (this._hiddenCategories.all) {
+ text += String.sprintf(WebInspector.UIString("%d / %d requests"), selectedRequestsNumber, requestsNumber);
+ text += " \u2758 " + String.sprintf(WebInspector.UIString("%s / %s transferred"), Number.bytesToString(selectedTransferSize), Number.bytesToString(transferSize));
+ } else {
+ text += String.sprintf(WebInspector.UIString("%d requests"), requestsNumber);
+ text += " \u2758 " + String.sprintf(WebInspector.UIString("%s transferred"), Number.bytesToString(transferSize));
+ }
if (baseTime !== -1 && this._mainResourceLoadTime !== -1 && this._mainResourceDOMContentTime !== -1 && this._mainResourceDOMContentTime > baseTime) {
text += " \u2758 " + String.sprintf(WebInspector.UIString("%s (onload: %s, DOMContentLoaded: %s)"),
Number.secondsToString(maxTime - baseTime),
@@ -428,6 +441,7 @@
this._filter(e.target, selectMultiple);
this.performSearch(null, true);
+ this._updateSummaryBar();
},
_filter: function(target, selectMultiple)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
