Merge WebKit at r78450: Initial merge by git.

[android-x86/external-webkit.git] / Source / WebCore / inspector / front-end / ResourceTreeModel.js

diff --git a/Source/WebCore/inspector/front-end/ResourceTreeModel.js b/Source/WebCore/inspector/front-end/ResourceTreeModel.js
index b114b94..da2d47a 100644 (file)
--- a/Source/WebCore/inspector/front-end/ResourceTreeModel.js
+++ b/Source/WebCore/inspector/front-end/ResourceTreeModel.js
@@ -31,16 +31,17 @@
 
 WebInspector.ResourceTreeModel = function()
 {
-    this.reloadCachedResources();
+    this.reset();
 }
 
 WebInspector.ResourceTreeModel.prototype = {
-    reloadCachedResources: function()
+    reset: function()
     {
         this._resourcesByURL = {};
         this._resourcesByFrameId = {};
         this._subframes = {};
-        InspectorBackend.cachedResources(this._processCachedResources.bind(this));
+        if (WebInspector.panels)
+            WebInspector.panels.resources.clear();
     },
 
     addOrUpdateFrame: function(frame)
@@ -81,6 +82,7 @@ WebInspector.ResourceTreeModel.prototype = {
             this._resourcesByFrameId[frameId] = resourcesForFrame;
         }
         resourcesForFrame.push(resource);
+        this._bindResourceURL(resource);
 
         WebInspector.panels.resources.addResourceToFrame(frameId, resource);
     },
@@ -128,7 +130,7 @@ WebInspector.ResourceTreeModel.prototype = {
         return entry;
     },
 
-    bindResourceURL: function(resource)
+    _bindResourceURL: function(resource)
     {
         var resourceForURL = this._resourcesByURL[resource.url];
         if (!resourceForURL)
@@ -168,7 +170,7 @@ WebInspector.ResourceTreeModel.prototype = {
                 preservedResourcesForFrame.push(resource);
                 continue;
             }
-            this.unbindResourceURL(resource);
+            this._unbindResourceURL(resource);
         }
 
         delete this._resourcesByFrameId[frameId];
@@ -194,7 +196,7 @@ WebInspector.ResourceTreeModel.prototype = {
         return false;
     },
 
-    unbindResourceURL: function(resource)
+    _unbindResourceURL: function(resource)
     {
         var resourceForURL = this._resourcesByURL[resource.url];
         if (!resourceForURL)
@@ -208,52 +210,5 @@ WebInspector.ResourceTreeModel.prototype = {
         }
 
         delete this._resourcesByURL[resource.url];
-    },
-
-    _processCachedResources: function(mainFramePayload)
-    {
-        var mainResource = this._addFramesRecursively(mainFramePayload);
-        WebInspector.mainResource = mainResource;
-        mainResource.isMainResource = true;
-    },
-
-    _addFramesRecursively: function(framePayload)
-    {
-        var frameResource = this.createResource(null, framePayload.resource.url, framePayload.resource.loader);
-        WebInspector.NetworkManager.updateResourceWithRequest(frameResource, framePayload.resource.request);
-        WebInspector.NetworkManager.updateResourceWithResponse(frameResource, framePayload.resource.response);
-        frameResource.type = WebInspector.Resource.Type["Document"];
-        frameResource.finished = true;
-
-        this.addOrUpdateFrame(framePayload);
-        this.addResourceToFrame(framePayload.id, frameResource);
-
-        for (var i = 0; framePayload.children && i < framePayload.children.length; ++i)
-            this._addFramesRecursively(framePayload.children[i]);
-
-        if (!framePayload.subresources)
-            return;
-
-        for (var i = 0; i < framePayload.subresources.length; ++i) {
-            var cachedResource = framePayload.subresources[i];
-            var resource = this.createResource(null, cachedResource.url, cachedResource.loader);
-            WebInspector.NetworkManager.updateResourceWithCachedResource(resource, cachedResource);
-            resource.finished = true;
-            this.addResourceToFrame(framePayload.id, resource);
-        }
-        return frameResource;
-    },
-
-    createResource: function(identifier, url, loader, stackTrace)
-    {
-        var resource = new WebInspector.Resource(identifier, url);
-        resource.loader = loader;
-        if (loader) {
-            resource.documentURL = loader.url;
-            this.bindResourceURL(resource);
-        }
-        resource.stackTrace = stackTrace;
-
-        return resource;
     }
 }