[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
pfeldman at chromium.org
pfeldman at chromium.org
Wed Dec 22 14:55:49 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 088431bf07177a98b485a996aaad34f44e5f7b3f
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 25 16:01:34 2010 +0000
2010-10-25 Pavel Feldman <pfeldman at 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):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70454 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 675af01..e09c09d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,29 @@
+2010-10-25 Pavel Feldman <pfeldman at 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 at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/inspector/front-end/Resource.js b/WebCore/inspector/front-end/Resource.js
index 0f57e6c..716b5d7 100644
--- a/WebCore/inspector/front-end/Resource.js
+++ b/WebCore/inspector/front-end/Resource.js
@@ -105,9 +105,16 @@ WebInspector.Resource.prototype = {
this.path = parsedURL ? parsedURL.path : "";
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();
},
diff --git a/WebCore/inspector/front-end/StoragePanel.js b/WebCore/inspector/front-end/StoragePanel.js
index c0b0b59..abb5785 100644
--- a/WebCore/inspector/front-end/StoragePanel.js
+++ b/WebCore/inspector/front-end/StoragePanel.js
@@ -77,7 +77,7 @@ WebInspector.StoragePanel = function(database)
WebInspector.StoragePanel.prototype = {
get toolbarItemLabel()
{
- return WebInspector.UIString("Storage");
+ return Preferences.networkPanelEnabled ? WebInspector.UIString("Resources") : WebInspector.UIString("Storage");
},
get statusBarItems()
@@ -262,7 +262,7 @@ WebInspector.StoragePanel.prototype = {
showResource: function(resource, line)
{
- var resourceTreeElement = this.sidebarTree.findTreeElement(resource);
+ var resourceTreeElement = this._findTreeElementForResource(resource);
if (resourceTreeElement) {
resourceTreeElement.reveal();
resourceTreeElement.select();
@@ -566,11 +566,28 @@ WebInspector.StoragePanel.prototype = {
{
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);
+ },
+
searchCanceled: function(startingNewSearch)
{
WebInspector.Panel.prototype.searchCanceled.call(this, startingNewSearch);
@@ -618,6 +635,10 @@ WebInspector.BaseStorageTreeElement.prototype = {
this.listItemElement.removeChildren();
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";
this.listItemElement.appendChild(this.imageElement);
@@ -626,10 +647,6 @@ WebInspector.BaseStorageTreeElement.prototype = {
this.titleElement.className = "base-storage-tree-element-title";
this.titleElement.textContent = this._titleText;
this.listItemElement.appendChild(this.titleElement);
-
- var selectionElement = document.createElement("div");
- selectionElement.className = "selection";
- this.listItemElement.appendChild(selectionElement);
},
onreveal: function()
diff --git a/WebCore/inspector/front-end/inspector.css b/WebCore/inspector/front-end/inspector.css
index 1031b0e..ab59fb8 100644
--- a/WebCore/inspector/front-end/inspector.css
+++ b/WebCore/inspector/front-end/inspector.css
@@ -1918,35 +1918,45 @@ body.inactive .sidebar {
}
.storage.panel .sidebar {
- border-left: rgb(232, 232, 232);
- background-color: transparent;
- padding-left: 0px;
+ padding-left: 0;
+ z-index: 10;
}
-.storage.panel .outline-disclosure li {
+.storage.panel .sidebar li {
height: 17px;
white-space: nowrap;
text-indent: 0;
margin-left: -2px;
}
-.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 .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 .outline-disclosure .icon {
+.storage.panel .sidebar .icon {
width: 16px;
height: 16px;
float: left;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list