Changeset 72654 in webkit

Timestamp:

Nov 24, 2010 2:28:27 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

2010-11-24 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: add "Locally modified" group into the resource panel.
​https://bugs.webkit.org/show_bug.cgi?id=50005

• English.lproj/localizedStrings.js:
• inspector/front-end/ResourcesPanel.js: (WebInspector.ResourcesPanel): (WebInspector.ResourcesPanel.prototype.reset): (WebInspector.ResourcesPanel.prototype.addLocallyModifiedRevision): (WebInspector.ResourcesPanel.prototype._innerShowView): (WebInspector.BaseStorageTreeElement.prototype.set titleText): (WebInspector.LocallyModifiedResourceTreeElement): (WebInspector.LocallyModifiedResourceTreeElement.prototype.onselect): (WebInspector.LocallyModifiedResourceTreeElement.prototype.gcRevisions): (WebInspector.LocallyModifiedRevisionTreeElement): (WebInspector.LocallyModifiedRevisionTreeElement.prototype.onattach): (WebInspector.LocallyModifiedRevisionTreeElement.prototype.onselect): (WebInspector.LocallyModifiedRevisionTreeElement.prototype._ondragstart):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• English.lproj/localizedStrings.js (modified) (previous)
• inspector/front-end/ResourcesPanel.js (modified) (9 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-24  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: add "Locally modified" group into the resource panel.
+        https://bugs.webkit.org/show_bug.cgi?id=50005
+
+        * English.lproj/localizedStrings.js:
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.ResourcesPanel):
+        (WebInspector.ResourcesPanel.prototype.reset):
+        (WebInspector.ResourcesPanel.prototype.addLocallyModifiedRevision):
+        (WebInspector.ResourcesPanel.prototype._innerShowView):
+        (WebInspector.BaseStorageTreeElement.prototype.set titleText):
+        (WebInspector.LocallyModifiedResourceTreeElement):
+        (WebInspector.LocallyModifiedResourceTreeElement.prototype.onselect):
+        (WebInspector.LocallyModifiedResourceTreeElement.prototype.gcRevisions):
+        (WebInspector.LocallyModifiedRevisionTreeElement):
+        (WebInspector.LocallyModifiedRevisionTreeElement.prototype.onattach):
+        (WebInspector.LocallyModifiedRevisionTreeElement.prototype.onselect):
+        (WebInspector.LocallyModifiedRevisionTreeElement.prototype._ondragstart):
+
 2010-11-24  Pavel Feldman  <pfeldman@chromium.org>
 

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

@@ -57 +57 @@
     this.sidebarTree.appendChild(this.applicationCacheListTreeElement);
 
+    this.locallyModifiedListTreeElement = new WebInspector.StorageCategoryTreeElement(this, WebInspector.UIString("Locally Modified"), "LocallyModified", "frame-storage-tree-item");
+    this.sidebarTree.appendChild(this.locallyModifiedListTreeElement);
+    this.locallyModifiedListTreeElement.hidden = true;
+
     if (Preferences.fileSystemEnabled) {
         this.fileSystemListTreeElement = new WebInspector.StorageCategoryTreeElement(this, WebInspector.UIString("File System"), "FileSystem", "file-system-storage-tree-item");
@@ -62 +66 @@
         this.fileSystemListTreeElement.expand();
     }
-       
+
     this.storageViews = document.createElement("div");
     this.storageViews.id = "storage-views";
@@ -75 +79 @@
     this._origins = {};
     this._domains = {};
+    this._locallyModifiedResources = {};
 
     this.sidebarElement.addEventListener("mousemove", this._onmousemove.bind(this), false);
@@ -148 +153 @@
 
         this._cookieViews = {};
-        
+        this._locallyModifiedResources = {};
         this._fileSystemView = null;
         
@@ -159 +164 @@
         this.cookieListTreeElement.removeChildren();
         this.applicationCacheListTreeElement.removeChildren();
+        this.locallyModifiedListTreeElement.removeChildren();
         if (Preferences.fileSystemEnabled)
             this.fileSystemListTreeElement.removeChildren();
@@ -307 +313 @@
         else
             this.sessionStorageListTreeElement.appendChild(domStorageTreeElement);
+    },
+
+    addLocallyModifiedRevision: function(url, resourceType, content)
+    {
+        this.locallyModifiedListTreeElement.hidden = false;
+
+        var newRevision = new WebInspector.LocallyModifiedRevisionTreeElement(this, url, resourceType, content);
+        var lastRevision = this._locallyModifiedResources[url];
+        this._locallyModifiedResources[url] = newRevision;
+
+        if (lastRevision)
+            lastRevision.becomeLogEntry(newRevision);
+        else
+            this.locallyModifiedListTreeElement.appendChild(newRevision);
     },
 
@@ -458 +478 @@
     {
         if (this.visibleView)
-            this.visibleView.hide();
+            this.visibleView.detach();
 
         view.show(this.storageViews);
@@ -814 +834 @@
     {
         this._titleText = titleText;
-        this.titleElement.textContent = this._titleText;
+        if (this.titleElement)
+            this.titleElement.textContent = this._titleText;
     },
 
@@ -1182 +1203 @@
 WebInspector.ApplicationCacheTreeElement.prototype.__proto__ = WebInspector.BaseStorageTreeElement.prototype;
 
+WebInspector.LocallyModifiedRevisionTreeElement = function(storagePanel, url, resourceType, content)
+{
+    var resource = new WebInspector.Resource(null, url);
+    resource.type = resourceType;
+    resource.content = content;
+
+    var timestamp = new Date();
+    WebInspector.BaseStorageTreeElement.call(this, storagePanel, null, resource.displayName, "resource-sidebar-tree-item resources-category-" + resource.category.name);
+    this.tooltip = resource.url;
+    this.timestamp = timestamp;
+    this._resource = resource;
+}
+
+WebInspector.LocallyModifiedRevisionTreeElement.prototype = {
+    becomeLogEntry: function(newRevision)
+    {
+        var oldChildren = this.children.slice();
+        var oldExpanded = this.expanded;
+        var oldIndex = this.parent.children.indexOf(this);
+
+        this.removeChildren();
+        this.titleText = this.timestamp.toLocaleTimeString();
+        this.toLocaleString();
+        this.hasChildren = false;
+
+        this.parent.insertChild(newRevision, oldIndex);
+        this.parent.removeChild(this);
+
+        const oneMinute = 1000 * 60;
+        if (newRevision.timestamp - this.timestamp > oneMinute)
+            newRevision.appendChild(this);
+
+        for (var i = 0; i < oldChildren.length; ++i)
+            newRevision.appendChild(oldChildren[i]);
+        if (oldExpanded)
+            newRevision.expand();
+    },
+
+    onattach: function()
+    {
+        WebInspector.BaseStorageTreeElement.prototype.onattach.call(this);
+        this.listItemElement.draggable = true;
+        this.listItemElement.addEventListener("dragstart", this._ondragstart.bind(this), false);
+    },
+
+    onselect: function()
+    {
+        WebInspector.BaseStorageTreeElement.prototype.onselect.call(this);
+        this._storagePanel._showResourceView(this._resource);
+    },
+
+    _ondragstart: function(event)
+    {
+        event.dataTransfer.setData("text/plain", this._resource.content);
+        event.dataTransfer.effectAllowed = "copy";
+        return true;
+    }
+}
+WebInspector.LocallyModifiedRevisionTreeElement.prototype.__proto__ = WebInspector.BaseStorageTreeElement.prototype;
+
 WebInspector.FileSystemTreeElement = function(storagePanel, origin)
 {