Changeset 99689 in webkit

Timestamp:

Nov 9, 2011 5:02:03 AM (13 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: Extract ApplicationCacheModel from ApplicationCacheItemsView.
​https://bugs.webkit.org/show_bug.cgi?id=71850

Reviewed by Pavel Feldman.

• WebCore.gypi:
• WebCore.vcproj/WebCore.vcproj:
• inspector/compile-front-end.sh:
• inspector/front-end/ApplicationCacheItemsView.js:

(WebInspector.ApplicationCacheItemsView):
(WebInspector.ApplicationCacheItemsView.prototype._update):

• inspector/front-end/ApplicationCacheModel.js: Added.

(WebInspector.ApplicationCacheModel):
(WebInspector.ApplicationCacheModel.prototype.getApplicationCachesAsync):
(WebInspector.ApplicationCacheDispatcher):
(WebInspector.ApplicationCacheDispatcher.prototype.updateApplicationCacheStatus):
(WebInspector.ApplicationCacheDispatcher.prototype.updateNetworkState):

• inspector/front-end/ResourcesPanel.js:

(WebInspector.ResourcesPanel.prototype.wasShown):
(WebInspector.ResourcesPanel.prototype.reset):
(WebInspector.ResourcesPanel.prototype._populateResourceTree):
(WebInspector.ResourcesPanel.prototype.showApplicationCache):
(WebInspector.ResourcesPanel.prototype._initializeApplicationCacheModel):

• inspector/front-end/WebKit.qrc:
• inspector/front-end/inspector.html:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.gypi (modified) (1 diff)
• WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
• inspector/compile-front-end.sh (modified) (1 diff)
• inspector/front-end/ApplicationCacheItemsView.js (modified) (3 diffs)
• inspector/front-end/ApplicationCacheModel.js (added)
• inspector/front-end/ResourcesPanel.js (modified) (9 diffs)
• inspector/front-end/WebKit.qrc (modified) (1 diff)
• inspector/front-end/inspector.html (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-09  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: Extract ApplicationCacheModel from ApplicationCacheItemsView.
+        https://bugs.webkit.org/show_bug.cgi?id=71850
+
+        Reviewed by Pavel Feldman.
+
+        * WebCore.gypi:
+        * WebCore.vcproj/WebCore.vcproj:
+        * inspector/compile-front-end.sh:
+        * inspector/front-end/ApplicationCacheItemsView.js:
+        (WebInspector.ApplicationCacheItemsView):
+        (WebInspector.ApplicationCacheItemsView.prototype._update):
+        * inspector/front-end/ApplicationCacheModel.js: Added.
+        (WebInspector.ApplicationCacheModel):
+        (WebInspector.ApplicationCacheModel.prototype.getApplicationCachesAsync):
+        (WebInspector.ApplicationCacheDispatcher):
+        (WebInspector.ApplicationCacheDispatcher.prototype.updateApplicationCacheStatus):
+        (WebInspector.ApplicationCacheDispatcher.prototype.updateNetworkState):
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.ResourcesPanel.prototype.wasShown):
+        (WebInspector.ResourcesPanel.prototype.reset):
+        (WebInspector.ResourcesPanel.prototype._populateResourceTree):
+        (WebInspector.ResourcesPanel.prototype.showApplicationCache):
+        (WebInspector.ResourcesPanel.prototype._initializeApplicationCacheModel):
+        * inspector/front-end/WebKit.qrc:
+        * inspector/front-end/inspector.html:
+
 2011-11-09  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/WebCore.gypi

@@ -6275 +6275 @@
             'inspector/front-end/AdvancedSearchController.js',
             'inspector/front-end/ApplicationCacheItemsView.js',
+            'inspector/front-end/ApplicationCacheModel.js',
             'inspector/front-end/AuditCategories.js',
             'inspector/front-end/AuditFormatters.js',

trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -68574 +68574 @@
                                 </File>
                                 <File
+                                        RelativePath="..\inspector\front-end\ApplicationCacheModel.js"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\inspector\front-end\AuditCategories.js"
                                         >

trunk/Source/WebCore/inspector/compile-front-end.sh

@@ -46 +46 @@
         --js Source/WebCore/inspector/front-end/HandlerRegistry.js \
         --js Source/WebCore/inspector/front-end/InspectorFrontendHostStub.js \
-    --module jsmodule_sdk:25:jsmodule_common \
+    --module jsmodule_sdk:26:jsmodule_common \
+        --js Source/WebCore/inspector/front-end/ApplicationCacheModel.js \
         --js Source/WebCore/inspector/front-end/CompilerSourceMapping.js \
         --js Source/WebCore/inspector/front-end/CompilerSourceMappingProvider.js \

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

@@ -28 +28 @@
  * @extends {WebInspector.View}
  */
-WebInspector.ApplicationCacheItemsView = function(treeElement, appcacheDomain)
+WebInspector.ApplicationCacheItemsView = function(model, treeElement, appcacheDomain)
 {
     WebInspector.View.call(this);
+    
+    this._model = model;
 
     this.element.addStyleClass("storage-view");
@@ -150 +152 @@
     _update: function()
     {
-        WebInspector.ApplicationCacheDispatcher.getApplicationCachesAsync(this._updateCallback.bind(this));
+        this._model.getApplicationCachesAsync(this._updateCallback.bind(this));
     },
 
@@ -275 +277 @@
 
 WebInspector.ApplicationCacheItemsView.prototype.__proto__ = WebInspector.View.prototype;
-
-/**
- * @constructor
- * @implements {ApplicationCacheAgent.Dispatcher}
- */
-WebInspector.ApplicationCacheDispatcher = function()
-{
-}
-
-WebInspector.ApplicationCacheDispatcher.getApplicationCachesAsync = function(callback)
-{
-    function mycallback(error, applicationCaches)
-    {
-        // FIXME: Currently, this list only returns a single application cache.
-        if (!error && applicationCaches)
-            callback(applicationCaches);
-    }
-
-    ApplicationCacheAgent.getApplicationCaches(mycallback);
-}
-
-WebInspector.ApplicationCacheDispatcher.prototype = {
-    updateApplicationCacheStatus: function(status)
-    {
-        WebInspector.panels.resources.updateApplicationCacheStatus(status);
-    },
-
-    updateNetworkState: function(isNowOnline)
-    {
-        WebInspector.panels.resources.updateNetworkState(isNowOnline);
-    }
-}
-
-InspectorBackend.registerApplicationCacheDispatcher(new WebInspector.ApplicationCacheDispatcher());

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

@@ -109 +109 @@
     {
         WebInspector.Panel.prototype.wasShown.call(this);
-        this._populateResourceTree();
+        if (!this._initialized) {
+            this._populateResourceTree();
+            this._initializeApplicationCacheModel();
+
+            this._initDefaultSelection();
+            
+            this._initialized = true;
+        }
     },
 
@@ -119 +126 @@
     _initDefaultSelection: function()
     {
-        if (!this._treeElementForFrameId)
+        if (!this._initialized)
             return;
 
@@ -138 +145 @@
     reset: function()
     {
+        this.resourcesListTreeElement.removeChildren();
+        this._treeElementForFrameId = {};
+
         this._origins = {};
         this._domains = {};
@@ -178 +188 @@
     _populateResourceTree: function()
     {
-        if (this._treeElementForFrameId)
-            return;
-
         this._treeElementForFrameId = {};
         WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameAdded, this._frameAdded, this);
@@ -187 +194 @@
         WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, this._resourceAdded, this);
         WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded, this._cachedResourcesLoaded, this);
-        WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.WillLoadCachedResources, this._resetResourcesTree, this);
+        WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.WillLoadCachedResources, this.reset, this);
 
         function populateFrame(frameId)
@@ -202 +209 @@
         }
         populateFrame.call(this, "");
-
-        this._initDefaultSelection();
     },
 
@@ -258 +263 @@
         if (frameTreeElement)
             frameTreeElement.frameNavigated(event.data.frame);
-    },
-
-    _resetResourcesTree: function()
-    {
-        this.resourcesListTreeElement.removeChildren();
-        this._treeElementForFrameId = {};
-        this.reset();
     },
 
@@ -487 +485 @@
         var view = this._applicationCacheView;
         if (!view) {
-            view = new WebInspector.ApplicationCacheItemsView(treeElement, appcacheDomain);
+            view = new WebInspector.ApplicationCacheItemsView(this._applicationCacheModel, treeElement, appcacheDomain);
             this._applicationCacheView = view;
         }
@@ -569 +567 @@
     },
 
+    _initializeApplicationCacheModel: function()
+    {
+        this._applicationCacheModel = new WebInspector.ApplicationCacheModel();
+    },
+    
     updateApplicationCacheStatus: function(status)
     {

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

@@ -4 +4 @@
     <file>AdvancedSearchController.js</file>
     <file>ApplicationCacheItemsView.js</file>
+    <file>ApplicationCacheModel.js</file>
     <file>AuditCategories.js</file>
     <file>AuditFormatters.js</file>

trunk/Source/WebCore/inspector/front-end/inspector.html

@@ -79 +79 @@
     <script type="text/javascript" src="CookiesTable.js"></script>
     <script type="text/javascript" src="CookieItemsView.js"></script>
+    <script type="text/javascript" src="ApplicationCacheModel.js"></script>
     <script type="text/javascript" src="ApplicationCacheItemsView.js"></script>
     <script type="text/javascript" src="Script.js"></script>