Changeset 55999 in webkit

Timestamp:

Mar 15, 2010 9:22:24 AM (14 years ago)

Author:

apavlov@chromium.org

Message:

2010-03-15 Alexander Pavlov <​apavlov@chromium.org>

Reviewed by Timothy Hatcher.

Web Inspector: Implement a progress indicator in the Audits panel
when resources are reloading
​https://bugs.webkit.org/show_bug.cgi?id=35971

• English.lproj/localizedStrings.js:
• GNUmakefile.am:
• WebCore.gypi:
• inspector/front-end/AuditLauncherView.js: (WebInspector.AuditLauncherView.prototype.updateResourceTrackingState): (WebInspector.AuditLauncherView.prototype.get totalResources): (WebInspector.AuditLauncherView.prototype.set totalResources): (WebInspector.AuditLauncherView.prototype.get loadedResources): (WebInspector.AuditLauncherView.prototype.set loadedResources): (WebInspector.AuditLauncherView.prototype._resetResourceCount): (WebInspector.AuditLauncherView.prototype.resourceStarted): (WebInspector.AuditLauncherView.prototype.resourceFinished): (WebInspector.AuditLauncherView.prototype.reset): (WebInspector.AuditLauncherView.prototype._setAuditRunning): (WebInspector.AuditLauncherView.prototype._launchButtonClicked): (WebInspector.AuditLauncherView.prototype._createCategoryElement): (WebInspector.AuditLauncherView.prototype._createLauncherUI): (WebInspector.AuditLauncherView.prototype._updateResourceProgress): (WebInspector.AuditLauncherView.prototype._updateButton):
• inspector/front-end/AuditsPanel.js: (WebInspector.AuditsPanel.prototype.resourceStarted): (WebInspector.AuditsPanel.prototype.resourceFinished): (WebInspector.AuditsPanel.prototype.reset):
• inspector/front-end/Images/spinner.gif: Added.
• inspector/front-end/WebKit.qrc:
• inspector/front-end/audits.css: (.audit-launcher-view .resource-progress > img):
• inspector/front-end/inspector.js: (WebInspector.updateResource):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• English.lproj/localizedStrings.js (modified) (previous)
• GNUmakefile.am (modified) (1 diff)
• WebCore.gypi (modified) (1 diff)
• inspector/front-end/AuditLauncherView.js (modified) (8 diffs)
• inspector/front-end/AuditsPanel.js (modified) (2 diffs)
• inspector/front-end/Images/spinner.gif (added)
• inspector/front-end/WebKit.qrc (modified) (1 diff)
• inspector/front-end/audits.css (modified) (1 diff)
• inspector/front-end/inspector.js (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-15  Alexander Pavlov  <apavlov@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Implement a progress indicator in the Audits panel
+        when resources are reloading
+        https://bugs.webkit.org/show_bug.cgi?id=35971
+
+        * English.lproj/localizedStrings.js:
+        * GNUmakefile.am:
+        * WebCore.gypi:
+        * inspector/front-end/AuditLauncherView.js:
+        (WebInspector.AuditLauncherView.prototype.updateResourceTrackingState):
+        (WebInspector.AuditLauncherView.prototype.get totalResources):
+        (WebInspector.AuditLauncherView.prototype.set totalResources):
+        (WebInspector.AuditLauncherView.prototype.get loadedResources):
+        (WebInspector.AuditLauncherView.prototype.set loadedResources):
+        (WebInspector.AuditLauncherView.prototype._resetResourceCount):
+        (WebInspector.AuditLauncherView.prototype.resourceStarted):
+        (WebInspector.AuditLauncherView.prototype.resourceFinished):
+        (WebInspector.AuditLauncherView.prototype.reset):
+        (WebInspector.AuditLauncherView.prototype._setAuditRunning):
+        (WebInspector.AuditLauncherView.prototype._launchButtonClicked):
+        (WebInspector.AuditLauncherView.prototype._createCategoryElement):
+        (WebInspector.AuditLauncherView.prototype._createLauncherUI):
+        (WebInspector.AuditLauncherView.prototype._updateResourceProgress):
+        (WebInspector.AuditLauncherView.prototype._updateButton):
+        * inspector/front-end/AuditsPanel.js:
+        (WebInspector.AuditsPanel.prototype.resourceStarted):
+        (WebInspector.AuditsPanel.prototype.resourceFinished):
+        (WebInspector.AuditsPanel.prototype.reset):
+        * inspector/front-end/Images/spinner.gif: Added.
+        * inspector/front-end/WebKit.qrc:
+        * inspector/front-end/audits.css:
+        (.audit-launcher-view .resource-progress > img):
+        * inspector/front-end/inspector.js:
+        (WebInspector.updateResource):
+
 2010-03-15  Philippe Normand  <pnormand@igalia.com>
 

trunk/WebCore/GNUmakefile.am

@@ -3747 +3747 @@
 webinspectorimagesdir = ${datadir}/webkit-1.0/webinspector/Images
 dist_webinspectorimages_DATA = \
+        $(shell ls $(WebCore)/inspector/front-end/Images/*.gif) \
         $(shell ls $(WebCore)/inspector/front-end/Images/*.png)
 

trunk/WebCore/WebCore.gypi

@@ -3943 +3943 @@
             'inspector/front-end/Images/segmentSelectedEnd.png',
             'inspector/front-end/Images/sessionStorage.png',
+            'inspector/front-end/Images/spinner.gif',
             'inspector/front-end/Images/splitviewDimple.png',
             'inspector/front-end/Images/splitviewDividerBackground.png',

trunk/WebCore/inspector/front-end/AuditLauncherView.js

@@ -43 +43 @@
     this.element.appendChild(this._contentElement);
 
+    this._resetResourceCount();
+
     function categorySortFunction(a, b)
     {
@@ -68 +70 @@
         if (!this._auditPresentStateLabelElement)
             return;
+
+        this._resetResourceCount();
+
         if (isTracking) {
             this._auditPresentStateLabelElement.nodeValue = WebInspector.UIString("Audit Present State");
@@ -80 +85 @@
     },
 
+    get totalResources()
+    {
+        return this._totalResources;
+    },
+
+    set totalResources(x)
+    {
+        if (this._totalResources === x)
+            return;
+        this._totalResources = x;
+        this._updateResourceProgress();
+    },
+
+    get loadedResources()
+    {
+        return this._loadedResources;
+    },
+
+    set loadedResources(x)
+    {
+        if (this._loadedResources === x)
+            return;
+        this._loadedResources = x;
+        this._updateResourceProgress();
+    },
+
+    _resetResourceCount: function()
+    {
+        this.loadedResources = 0;
+
+        // We never receive a resourceStarted notification for the main resource
+        // (see InspectorController.willSendRequest())
+        this.totalResources = 1;
+    },
+
+    resourceStarted: function(resource)
+    {
+        ++this.totalResources;
+    },
+
+    resourceFinished: function(resource)
+    {
+        ++this.loadedResources;
+    },
+
+    reset: function()
+    {
+        this._resetResourceCount();
+    },
+
     _setAuditRunning: function(auditRunning)
     {
@@ -86 +141 @@
         this._auditRunning = auditRunning;
         this._updateButton();
+        this._updateResourceProgress();
     },
 
@@ -96 +152 @@
                 catIds.push(id);
         }
-        function profilingFinishedCallback()
-        {
-            this._setAuditRunning(false);
-        }
         this._setAuditRunning(true);
-        this._runnerCallback(catIds, this._auditPresentStateElement.checked, profilingFinishedCallback.bind(this));
+        this._runnerCallback(catIds, this._auditPresentStateElement.checked, this._setAuditRunning.bind(this, false));
     },
 
@@ -122 +174 @@
     _createCategoryElement: function(title, id)
     {
-        var element;
         var labelElement = document.createElement("label");
         labelElement.id = this._categoryIdPrefix + id;
 
-        element = document.createElement("input");
+        var element = document.createElement("input");
         element.type = "checkbox";
         labelElement.appendChild(element);
@@ -189 +240 @@
 
         this._launchButton = document.createElement("button");
-        this._launchButton.setAttribute("type", "button");
+        this._launchButton.type = "button";
+        this._launchButton.textContent = WebInspector.UIString("Run");
         this._launchButton.addEventListener("click", this._launchButtonClicked.bind(this), false);
         this._buttonContainerElement.appendChild(this._launchButton);
 
+        this._resourceProgressContainer = document.createElement("span");
+        this._resourceProgressContainer.className = "resource-progress";
+        var resourceProgressImage = document.createElement("img");
+        this._resourceProgressContainer.appendChild(resourceProgressImage);
+        this._resourceProgressTextElement = document.createElement("span");
+        this._resourceProgressContainer.appendChild(this._resourceProgressTextElement);
+        this._buttonContainerElement.appendChild(this._resourceProgressContainer);
+
         this._contentElement.appendChild(this._buttonContainerElement);
 
@@ -200 +260 @@
     },
 
+    _updateResourceProgress: function()
+    {
+        if (!this._resourceProgressContainer)
+            return;
+
+        if (!this._auditRunning)
+            this._resourceProgressContainer.addStyleClass("hidden");
+        else {
+            this._resourceProgressContainer.removeStyleClass("hidden");
+            this._resourceProgressTextElement.textContent = WebInspector.UIString("Loading (%d of %d)", this.loadedResources, this.totalResources);
+        }
+    },
+
     _updateButton: function()
     {
         this._launchButton.disabled = !this._currentCategoriesCount || this._auditRunning;
-        if (this._auditRunning)
-            this._launchButton.textContent = WebInspector.UIString("Running...");
-        else
-            this._launchButton.textContent = WebInspector.UIString("Run");
     }
 }

trunk/WebCore/inspector/front-end/AuditsPanel.js

@@ -99 +99 @@
     },
 
+    resourceStarted: function(resource)
+    {
+        this._launcherView.resourceStarted(resource);
+    },
+
+    resourceFinished: function(resource)
+    {
+        this._launcherView.resourceFinished(resource);
+    },
+
     _constructCategories: function()
     {
@@ -241 +251 @@
     },
 
+    reset: function()
+    {
+        this._launcherView.reset();
+    },
+
     attach: function()
     {

trunk/WebCore/inspector/front-end/WebKit.qrc

@@ -190 +190 @@
     <file>Images/segmentSelectedEnd.png</file>
     <file>Images/sessionStorage.png</file>
+    <file>Images/spinner.gif</file>
     <file>Images/splitviewDimple.png</file>
     <file>Images/splitviewDividerBackground.png</file>

trunk/WebCore/inspector/front-end/audits.css

@@ -174 +174 @@
 }
 
+.audit-launcher-view .resource-progress > img {
+    content: url(Images/spinner.gif);
+    vertical-align: text-top;
+    margin: 0 4px 0 8px;
+}
+
 .audit-result-view {
     overflow: auto;

trunk/WebCore/inspector/front-end/inspector.js

@@ -1077 +1077 @@
         if (this.panels.resources)
             this.panels.resources.addResource(resource);
+        if (this.panels.audits)
+            this.panels.audits.resourceStarted(resource);
     }
 
@@ -1121 +1123 @@
         resource.failed = payload.failed;
         resource.finished = payload.finished;
+        if (this.panels.audits)
+            this.panels.audits.resourceFinished(resource);
     }