Changeset 70454 in webkit

Timestamp:

Oct 25, 2010 9:01:34 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

2010-10-25 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Timothy Hatcher.

Web Inspector: slowly make old resources panel optional (continued).
​https://bugs.webkit.org/show_bug.cgi?id=48207

• inspector/front-end/Resource.js: (WebInspector.Resource.prototype.set url):
• inspector/front-end/StoragePanel.js: (WebInspector.StoragePanel.prototype.get toolbarItemLabel): (WebInspector.StoragePanel.prototype.showResource): (WebInspector.StoragePanel.prototype.searchMatchFound): (WebInspector.StoragePanel.prototype._findTreeElementForResource): (WebInspector.StoragePanel.prototype._findTreeElementForResource.getParent): (WebInspector.BaseStorageTreeElement.prototype.onattach):
• inspector/front-end/inspector.css: (.storage.panel .sidebar): (.storage.panel .sidebar li): (.storage.panel .sidebar li.parent): (.storage.panel .sidebar li.selected): (.storage.panel .sidebar li .selection): (.storage.panel .sidebar :focus li .selection): (body.inactive .storage.panel .sidebar li .selection): (.storage.panel .sidebar .icon):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/Resource.js (modified) (1 diff)
• inspector/front-end/StoragePanel.js (modified) (5 diffs)
• inspector/front-end/inspector.css (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-25  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: slowly make old resources panel optional (continued).
+        https://bugs.webkit.org/show_bug.cgi?id=48207
+
+        * inspector/front-end/Resource.js:
+        (WebInspector.Resource.prototype.set url):
+        * inspector/front-end/StoragePanel.js:
+        (WebInspector.StoragePanel.prototype.get toolbarItemLabel):
+        (WebInspector.StoragePanel.prototype.showResource):
+        (WebInspector.StoragePanel.prototype.searchMatchFound):
+        (WebInspector.StoragePanel.prototype._findTreeElementForResource):
+        (WebInspector.StoragePanel.prototype._findTreeElementForResource.getParent):
+        (WebInspector.BaseStorageTreeElement.prototype.onattach):
+        * inspector/front-end/inspector.css:
+        (.storage.panel .sidebar):
+        (.storage.panel .sidebar li):
+        (.storage.panel .sidebar li.parent):
+        (.storage.panel .sidebar li.selected):
+        (.storage.panel .sidebar li .selection):
+        (.storage.panel .sidebar :focus li .selection):
+        (body.inactive .storage.panel .sidebar li .selection):
+        (.storage.panel .sidebar .icon):
+
 2010-10-25  No'am Rosenthal  <noam.rosenthal@nokia.com>
 

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

@@ -106 +106 @@
         this.lastPathComponent = "";
         if (parsedURL && parsedURL.path) {
-            var lastSlashIndex = parsedURL.path.lastIndexOf("/");
+            // First cut the query params.
+            var path = parsedURL.path;
+            var indexOfQuery = path.indexOf("?");
+            if (indexOfQuery !== -1)
+                path = path.substring(0, indexOfQuery);
+
+            // Then take last path component.
+            var lastSlashIndex = path.lastIndexOf("/");
             if (lastSlashIndex !== -1)
-                this.lastPathComponent = parsedURL.path.substring(lastSlashIndex + 1);
+                this.lastPathComponent = path.substring(lastSlashIndex + 1);
         }
         this.lastPathComponentLowerCase = this.lastPathComponent.toLowerCase();

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

@@ -78 +78 @@
     get toolbarItemLabel()
     {
-        return WebInspector.UIString("Storage");
+        return Preferences.networkPanelEnabled ? WebInspector.UIString("Resources") : WebInspector.UIString("Storage");
     },
 
@@ -263 +263 @@
     showResource: function(resource, line)
     {
-        var resourceTreeElement = this.sidebarTree.findTreeElement(resource);
+        var resourceTreeElement = this._findTreeElementForResource(resource);
         if (resourceTreeElement) {
             resourceTreeElement.reveal();
@@ -567 +567 @@
         if (!view.resource)
             return;
-        var treeElement = this.sidebarTree.findTreeElement(view.resource);
+        var treeElement = this._findTreeElementForResource(view.resource);
         if (treeElement)
             treeElement.searchMatchFound(matches);
+    },
+
+    _findTreeElementForResource: function(resource)
+    {
+        function isAncestor(ancestor, object)
+        {
+            console.error("There should be no calls to isAncestor, but there was one for ", object);
+            return false;
+        }
+
+        function getParent(object)
+        {
+            console.error("There should be no calls to getParent, but there was one for ", object);
+            return null;
+        }
+
+        return this.sidebarTree.findTreeElement(resource, isAncestor, getParent);
     },
 
@@ -619 +636 @@
         this.listItemElement.addStyleClass(this._iconClass);
 
+        var selectionElement = document.createElement("div");
+        selectionElement.className = "selection";
+        this.listItemElement.appendChild(selectionElement);
+
         this.imageElement = document.createElement("img");
         this.imageElement.className = "icon";
@@ -627 +648 @@
         this.titleElement.textContent = this._titleText;
         this.listItemElement.appendChild(this.titleElement);
-
-        var selectionElement = document.createElement("div");
-        selectionElement.className = "selection";
-        this.listItemElement.appendChild(selectionElement);
     },
 

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

@@ -1919 +1919 @@
 
 .storage.panel .sidebar {
-    border-left: rgb(232, 232, 232);
-    background-color: transparent;
-    padding-left: 0px;
-}
-
-.storage.panel .outline-disclosure li {
+    padding-left: 0;
+    z-index: 10;
+}
+
+.storage.panel .sidebar li {
     height: 17px;
     white-space: nowrap;
@@ -1931 +1930 @@
 }
 
-.storage.panel .outline-disclosure li.parent {
+.storage.panel .sidebar li.parent {
     text-indent: 0;
     margin-left: -12px;
 }
 
-.storage.panel .outline-disclosure li .selection {
+.storage.panel .sidebar li.selected {
+    color: white;
+    text-shadow: rgba(0, 0, 0, 0.33) 0 1px 0;
+    font-weight: bold;
+}
+
+.storage.panel .sidebar li .selection {
+    background-image: -webkit-gradient(linear, left top, left bottom, from(rgb(162, 177, 207)), to(rgb(120, 138, 177)));
+    border-top: 1px solid #979797;
     height: 17px;
-    margin-top: -13px;
-}
-
-.storage.panel .sidebar-resizer-vertical {
-    background: rgb(220, 220, 220);
-    border-left: 1px solid gray;
-    border-right: 1px solid gray;
-}
-
-.storage.panel .outline-disclosure .icon {
+}
+
+.storage.panel .sidebar :focus li .selection {
+    background-image: -webkit-gradient(linear, left top, left bottom, from(rgb(92, 147, 213)), to(rgb(21, 83, 170)));
+    border-top: 1px solid rgb(68, 128, 200);
+}
+
+body.inactive .storage.panel .sidebar li .selection {
+    background-image: -webkit-gradient(linear, left top, left bottom, from(rgb(180, 180, 180)), to(rgb(138, 138, 138)));
+    border-top: 1px solid rgb(151, 151, 151);
+}
+
+.storage.panel .sidebar .icon {
     width: 16px;
     height: 16px;