Changeset 100894 in webkit

Timestamp:

Nov 21, 2011 2:22:00 AM (12 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: ApplicationCache view should show navigator.onLine indicator.
​https://bugs.webkit.org/show_bug.cgi?id=72618

Reviewed by Pavel Feldman.

• inspector/InspectorApplicationCacheAgent.cpp:

(WebCore::InspectorApplicationCacheAgent::enable):

• inspector/front-end/ApplicationCacheItemsView.js:

(WebInspector.ApplicationCacheItemsView):
(WebInspector.ApplicationCacheItemsView.prototype.wasShown):

• inspector/front-end/ApplicationCacheModel.js:

(WebInspector.ApplicationCacheModel):
(WebInspector.ApplicationCacheModel.prototype.get onLine):
(WebInspector.ApplicationCacheModel.prototype._networkStateUpdated):

• inspector/front-end/ResourcesPanel.js:

(WebInspector.ResourcesPanel.prototype.showApplicationCache):
(WebInspector.ResourcesPanel.prototype._applicationCacheNetworkStateChanged):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorApplicationCacheAgent.cpp (modified) (1 diff)
• inspector/front-end/ApplicationCacheItemsView.js (modified) (3 diffs)
• inspector/front-end/ApplicationCacheModel.js (modified) (3 diffs)
• inspector/front-end/ResourcesPanel.js (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-21  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: ApplicationCache view should show navigator.onLine indicator.
+        https://bugs.webkit.org/show_bug.cgi?id=72618
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/InspectorApplicationCacheAgent.cpp:
+        (WebCore::InspectorApplicationCacheAgent::enable):
+        * inspector/front-end/ApplicationCacheItemsView.js:
+        (WebInspector.ApplicationCacheItemsView):
+        (WebInspector.ApplicationCacheItemsView.prototype.wasShown):
+        * inspector/front-end/ApplicationCacheModel.js:
+        (WebInspector.ApplicationCacheModel):
+        (WebInspector.ApplicationCacheModel.prototype.get onLine):
+        (WebInspector.ApplicationCacheModel.prototype._networkStateUpdated):
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.ResourcesPanel.prototype.showApplicationCache):
+        (WebInspector.ResourcesPanel.prototype._applicationCacheNetworkStateChanged):
+
 2011-11-21  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp

@@ -80 +80 @@
     m_state->setBoolean(ApplicationCacheAgentState::applicationCacheAgentEnabled, true);
     m_instrumentingAgents->setInspectorApplicationCacheAgent(this);
+
+    // We need to pass initial navigator.onOnline.
+    networkStateChanged();
 }
 

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

@@ -28 +28 @@
  * @extends {WebInspector.View}
  */
-WebInspector.ApplicationCacheItemsView = function(model, frameId, status)
+WebInspector.ApplicationCacheItemsView = function(model, frameId)
 {
     WebInspector.View.call(this);
@@ -65 +65 @@
 
     this._markDirty();
+    
+    var status = this._model.frameManifestStatus(frameId);
     this.updateStatus(status);
+    
+    this.updateNetworkState(this._model.onLine);
 
     // FIXME: Status bar items don't work well enough yet, so they are being hidden.
     // http://webkit.org/b/41637 Web Inspector: Give Semantics to "Refresh" and "Delete" Buttons in ApplicationCache DataGrid
-    // http://webkit.org/b/72618 Web Inspector: ApplicationCache view should show navigator.onLine indicator.
     this.deleteButton.element.style.display = "none";
-    this.connectivityIcon.style.display = "none";
-    this.connectivityMessage.style.display = "none";
-    this.divider.style.display = "none";
 }
 
@@ -88 +88 @@
     wasShown: function()
     {
-        this.updateNetworkState(navigator.onLine);
         this._maybeUpdate();
     },

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

@@ -43 +43 @@
 
     this._mainFrameNavigated();
+    
+    this._onLine = true;
 }
 
@@ -168 +170 @@
     {
         return this._statuses[frameId] || applicationCache.UNCACHED;
+    },
+    
+    /**
+     * @return {number}
+     */
+    get onLine()
+    {
+        return this._onLine;
     },
     
@@ -205 +215 @@
     _networkStateUpdated: function(isNowOnline)
     {
+        this._onLine = isNowOnline;
         this.dispatchEventToListeners(WebInspector.ApplicationCacheModel.EventTypes.NetworkStateChanged, isNowOnline);
     }

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

@@ -480 +480 @@
     showApplicationCache: function(frameId)
     {
-        var status = this._applicationCacheModel.frameManifestStatus(frameId)
-
-        if (!this._applicationCacheViews[frameId]) {
-            this._applicationCacheViews[frameId] = new WebInspector.ApplicationCacheItemsView(this._applicationCacheModel, frameId, status);
-
-            // FIXME: Make sure this._cachedApplicationCacheNetworkState is always set and is always up to date.
-            if (typeof(this._cachedApplicationCacheNetworkState) === "number")
-                this._applicationCacheViews[frameId].updateNetworkState(this._cachedApplicationCacheNetworkState);
-        }
+        if (!this._applicationCacheViews[frameId])
+            this._applicationCacheViews[frameId] = new WebInspector.ApplicationCacheItemsView(this._applicationCacheModel, frameId);
 
         this._innerShowView(this._applicationCacheViews[frameId]);
@@ -632 +625 @@
         var isNowOnline = event.data;
 
-        this._cachedApplicationCacheNetworkState = isNowOnline;
         for (var manifestURL in this._applicationCacheViews)
             this._applicationCacheViews[manifestURL].updateNetworkState(isNowOnline);