[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 15:19:44 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 3180f6299b772e18bf734479fc6f700236e88b56
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 1 07:07:20 2010 +0000
2010-10-31 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
Web Inspector: unhide new network and resources panels.
https://bugs.webkit.org/show_bug.cgi?id=48725
* English.lproj/localizedStrings.js:
* inspector/InspectorController.h:
* inspector/front-end/NetworkPanel.js:
(WebInspector.NetworkPanel):
* inspector/front-end/Settings.js:
* inspector/front-end/StoragePanel.js:
(WebInspector.StoragePanel):
(WebInspector.StoragePanel.prototype.reset):
(WebInspector.StoragePanel.prototype.addResourceToFrame):
(WebInspector.StoragePanel.prototype.addDocumentURL):
(WebInspector.StoragePanel.prototype.showFileSystem):
(WebInspector.FileSystemTreeElement):
(WebInspector.FileSystemTreeElement.prototype.get itemURL):
(WebInspector.FileSystemTreeElement.prototype.onselect):
* inspector/front-end/inspector.js:
(WebInspector.updateResource):
* inspector/front-end/networkPanel.css:
(#network-close-button):
(.network.panel.viewing-resource #network-close-button):
2010-10-31 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
Web Inspector: unhide new network and resources panels.
https://bugs.webkit.org/show_bug.cgi?id=48725
* http/tests/inspector/console-xhr-logging-expected.txt:
* http/tests/inspector/resource-parameters-expected.txt:
* inspector/console-log-syntax-error-expected.txt:
* inspector/elements-panel-styles-expected.txt:
2010-10-31 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
Web Inspector: unhide new network and resources panels.
https://bugs.webkit.org/show_bug.cgi?id=48725
* src/WebDevToolsAgentImpl.cpp:
(WebKit::WebDevToolsAgentImpl::setApuAgentEnabled):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71010 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 568639c..b3f95f2 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-31 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Timothy Hatcher.
+
+ Web Inspector: unhide new network and resources panels.
+ https://bugs.webkit.org/show_bug.cgi?id=48725
+
+ * http/tests/inspector/console-xhr-logging-expected.txt:
+ * http/tests/inspector/resource-parameters-expected.txt:
+ * inspector/console-log-syntax-error-expected.txt:
+ * inspector/elements-panel-styles-expected.txt:
+
2010-10-31 Jeremy Moskovich <jeremy at chromium.org>
Reviewed by Ojan Vafai.
diff --git a/LayoutTests/http/tests/inspector/console-xhr-logging-expected.txt b/LayoutTests/http/tests/inspector/console-xhr-logging-expected.txt
index 55f50c4..d702fcd 100644
--- a/LayoutTests/http/tests/inspector/console-xhr-logging-expected.txt
+++ b/LayoutTests/http/tests/inspector/console-xhr-logging-expected.txt
@@ -12,13 +12,13 @@ console-xhr-logging.html:11enabled
console-xhr-logging.html:40sending a GET request to resources/xhr-exists.html
XHR finished loading: "http://127.0.0.1:8000/inspector/resources/xhr-exists.html".
console-xhr-logging.html:40sending a GET request to resources/xhr-does-not-exist.html
-resources/xhr-does-not-exist.htmlFailed to load resource: the server responded with a status of 404 (Not Found)
+xhr-does-not-exist.htmlFailed to load resource: the server responded with a status of 404 (Not Found)
XHR finished loading: "http://127.0.0.1:8000/inspector/resources/xhr-does-not-exist.html".
console-xhr-logging.html:40sending a POST request to resources/post-target.cgi
XHR finished loading: "http://127.0.0.1:8000/inspector/resources/post-target.cgi".
console-xhr-logging.html:21disabled
console-xhr-logging.html:40sending a GET request to resources/xhr-exists.html
console-xhr-logging.html:40sending a GET request to resources/xhr-does-not-exist.html
-resources/xhr-does-not-exist.htmlFailed to load resource: the server responded with a status of 404 (Not Found)
+xhr-does-not-exist.htmlFailed to load resource: the server responded with a status of 404 (Not Found)
console-xhr-logging.html:40sending a POST request to resources/post-target.cgi
diff --git a/LayoutTests/http/tests/inspector/resource-parameters-expected.txt b/LayoutTests/http/tests/inspector/resource-parameters-expected.txt
index c37334f..22fcfee 100644
--- a/LayoutTests/http/tests/inspector/resource-parameters-expected.txt
+++ b/LayoutTests/http/tests/inspector/resource-parameters-expected.txt
@@ -3,7 +3,7 @@ Tests that resources panel shows form data parameters.
{
- pageref : "about:blank"
+ pageref : "http://localhost:8000/inspector/resources/post-target.cgi?queryParam1=queryValue1&queryParam2="
startedDateTime : <string>
time : <number>
request : {
diff --git a/LayoutTests/inspector/elements-panel-styles-expected.txt b/LayoutTests/inspector/elements-panel-styles-expected.txt
index ef2e9e4..4dcea84 100644
--- a/LayoutTests/inspector/elements-panel-styles-expected.txt
+++ b/LayoutTests/inspector/elements-panel-styles-expected.txt
@@ -2,36 +2,36 @@ Tests that elements panel shows proper styles in the sidebar panel.
[expanded] ()
color: blue;
- .foo, .foo::before - blue resources/elements-panel-styles.css:15
- /-- overloaded --/ .foo - black resources/elements-panel-styles.css:10
+ .foo, .foo::before - blue elements-panel-styles.css:15
+ /-- overloaded --/ .foo - black elements-panel-styles.css:10
display: none;
element.style - none
/-- overloaded --/ div - block user agent stylesheet
font-family: serif;
- #container - serif resources/elements-panel-styles.css:5
+ #container - serif elements-panel-styles.css:5
font-size: 14px;
- #container - 14px resources/elements-panel-styles.css:5
- /-- overloaded --/ body - 12px resources/elements-panel-styles.css:1
+ #container - 14px elements-panel-styles.css:5
+ /-- overloaded --/ body - 12px elements-panel-styles.css:1
margin-bottom: 2px;
- .foo - 2px resources/elements-panel-styles.css:10
+ .foo - 2px elements-panel-styles.css:10
margin-left: 0px;
- .foo - 0px resources/elements-panel-styles.css:10
+ .foo - 0px elements-panel-styles.css:10
margin-right: 0px;
- .foo - 0px resources/elements-panel-styles.css:10
+ .foo - 0px elements-panel-styles.css:10
margin-top: 10px;
- .foo - 10px resources/elements-panel-styles.css:10
+ .foo - 10px elements-panel-styles.css:10
[expanded] element.style { ()
display: none;
======== Matched CSS Rules ========
-[expanded] .foo { (resources/elements-panel-styles.css:33)
+[expanded] .foo { (elements-panel-styles.css:33)
-[expanded] .foo, .foo::before { (resources/elements-panel-styles.css:15)
+[expanded] .foo, .foo::before { (elements-panel-styles.css:15)
color: blue;
content: '[before Foo]';
-[expanded] .foo { (resources/elements-panel-styles.css:10)
+[expanded] .foo { (elements-panel-styles.css:10)
/-- overloaded --/ color: black;
margin: 10px 0px 2px;
margin-top: 10px;
@@ -43,32 +43,32 @@ margin: 10px 0px 2px;
/-- overloaded --/ display: block;
======== Inherited from div#container ========
-[expanded] #container { (resources/elements-panel-styles.css:5)
+[expanded] #container { (elements-panel-styles.css:5)
font-family: serif;
font-size: 14px;
======== Inherited from body ========
-[expanded] body { (resources/elements-panel-styles.css:1)
+[expanded] body { (elements-panel-styles.css:1)
/-- overloaded --/ font-size: 12px;
======== Pseudo ::before element ========
-[expanded] .foo::before { (resources/elements-panel-styles.css:37)
+[expanded] .foo::before { (elements-panel-styles.css:37)
-[expanded] .foo::before { (resources/elements-panel-styles.css:20)
+[expanded] .foo::before { (elements-panel-styles.css:20)
color: red;
-[expanded] .foo, .foo::before { (resources/elements-panel-styles.css:15)
+[expanded] .foo, .foo::before { (elements-panel-styles.css:15)
/-- overloaded --/ color: blue;
content: '[before Foo]';
======== Pseudo ::after element ========
-[expanded] .foo::after { (resources/elements-panel-styles.css:28)
+[expanded] .foo::after { (elements-panel-styles.css:28)
content: '[after Foo 2]';
font-family: courier;
-[expanded] .foo::after { (resources/elements-panel-styles.css:24)
+[expanded] .foo::after { (elements-panel-styles.css:24)
color: green;
/-- overloaded --/ content: '[after Foo]';
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index af76c10..7016ed9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,30 @@
+2010-10-31 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Timothy Hatcher.
+
+ Web Inspector: unhide new network and resources panels.
+ https://bugs.webkit.org/show_bug.cgi?id=48725
+
+ * English.lproj/localizedStrings.js:
+ * inspector/InspectorController.h:
+ * inspector/front-end/NetworkPanel.js:
+ (WebInspector.NetworkPanel):
+ * inspector/front-end/Settings.js:
+ * inspector/front-end/StoragePanel.js:
+ (WebInspector.StoragePanel):
+ (WebInspector.StoragePanel.prototype.reset):
+ (WebInspector.StoragePanel.prototype.addResourceToFrame):
+ (WebInspector.StoragePanel.prototype.addDocumentURL):
+ (WebInspector.StoragePanel.prototype.showFileSystem):
+ (WebInspector.FileSystemTreeElement):
+ (WebInspector.FileSystemTreeElement.prototype.get itemURL):
+ (WebInspector.FileSystemTreeElement.prototype.onselect):
+ * inspector/front-end/inspector.js:
+ (WebInspector.updateResource):
+ * inspector/front-end/networkPanel.css:
+ (#network-close-button):
+ (.network.panel.viewing-resource #network-close-button):
+
2010-10-26 MORITA Hajime <morrita at google.com>
Reviewed by Kent Tamura.
diff --git a/WebCore/English.lproj/localizedStrings.js b/WebCore/English.lproj/localizedStrings.js
index a4a1997..57ae52d 100644
Binary files a/WebCore/English.lproj/localizedStrings.js and b/WebCore/English.lproj/localizedStrings.js differ
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index 8b00835..640987b 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -86,7 +86,7 @@ class SharedBuffer;
class Storage;
class StorageArea;
-#define LEGACY_RESOURCE_TRACKING_ENABLED 1
+#define LEGACY_RESOURCE_TRACKING_ENABLED 0
#if LEGACY_RESOURCE_TRACKING_ENABLED
class InspectorResource;
diff --git a/WebCore/inspector/front-end/NetworkPanel.js b/WebCore/inspector/front-end/NetworkPanel.js
index 8c3af6a..cda65b1 100644
--- a/WebCore/inspector/front-end/NetworkPanel.js
+++ b/WebCore/inspector/front-end/NetworkPanel.js
@@ -56,9 +56,9 @@ WebInspector.NetworkPanel = function()
this.element.appendChild(this._viewsContainerElement);
var closeButtonElement = document.createElement("button");
- closeButtonElement.className = "network-close-button";
+ closeButtonElement.id = "network-close-button";
closeButtonElement.addEventListener("click", this._toggleGridMode.bind(this), false);
- this._viewsContainerElement.appendChild(closeButtonElement);
+ this.element.appendChild(closeButtonElement);
this._createSortingFunctions();
this._createTable();
@@ -67,6 +67,9 @@ WebInspector.NetworkPanel = function()
this._createFilterStatusBarItems();
this._createSummaryBar();
+ if (!WebInspector.applicationSettings.resourcesLargeRows)
+ this._setLargerResources(WebInspector.applicationSettings.resourcesLargeRows);
+
this._popoverHelper = new WebInspector.PopoverHelper(this.element, this._getPopoverAnchor.bind(this), this._showPopover.bind(this), true);
this.calculator = new WebInspector.NetworkTransferTimeCalculator();
@@ -613,8 +616,6 @@ WebInspector.NetworkPanel.prototype = {
this._largerResourcesButton = new WebInspector.StatusBarButton(WebInspector.UIString("Use small resource rows."), "network-larger-resources-status-bar-item");
this._largerResourcesButton.toggled = WebInspector.applicationSettings.resourcesLargeRows;
- if (!WebInspector.applicationSettings.resourcesLargeRows)
- this._setLargerResources(WebInspector.applicationSettings.resourcesLargeRows);
this._largerResourcesButton.addEventListener("click", this._toggleLargerResources.bind(this), false);
},
@@ -901,6 +902,7 @@ WebInspector.NetworkPanel.prototype = {
this._timelineGrid.element.removeStyleClass("small");
this._viewsContainerElement.removeStyleClass("small");
}
+ this._positionSummaryBar();
},
_getPopoverAnchor: function(element)
diff --git a/WebCore/inspector/front-end/Resource.js b/WebCore/inspector/front-end/Resource.js
index 1a2ce96..b9a4439 100644
--- a/WebCore/inspector/front-end/Resource.js
+++ b/WebCore/inspector/front-end/Resource.js
@@ -25,7 +25,6 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
WebInspector.Resource = function(identifier, url)
{
this.identifier = identifier;
@@ -332,7 +331,7 @@ WebInspector.Resource.prototype = {
this.category = WebInspector.resourceCategories.xhr;
break;
case WebInspector.Resource.Type.WebSocket:
- this.category = WebInspector.resourceCategories.websocket;
+ this.category = WebInspector.resourceCategories.websockets;
break;
case WebInspector.Resource.Type.Other:
default:
@@ -643,6 +642,7 @@ WebInspector.Resource.prototype = {
for (var i = 0; i < callbacks.length; ++i)
callbacks[i](this._content, this._contentEncoded);
this._pendingContentCallbacks.length = 0;
+ delete this._contentRequested;
}
WebInspector.ResourceManager.getContent(this, this._contentEncoded, onResourceContent.bind(this));
}
diff --git a/WebCore/inspector/front-end/ResourceManager.js b/WebCore/inspector/front-end/ResourceManager.js
index 85ae21c..271c4f3 100644
--- a/WebCore/inspector/front-end/ResourceManager.js
+++ b/WebCore/inspector/front-end/ResourceManager.js
@@ -79,7 +79,8 @@ WebInspector.ResourceManager.prototype = {
{
var resource = new WebInspector.Resource(identifier, url);
resource.loader = loader;
- resource.documentURL = loader.url;
+ if (loader)
+ resource.documentURL = loader.url;
this._resourcesById[identifier] = resource;
return resource;
@@ -136,6 +137,7 @@ WebInspector.ResourceManager.prototype = {
return;
resource.cached = true;
+ delete resource.timing;
WebInspector.panels.network.refreshResource(resource);
},
@@ -267,10 +269,8 @@ WebInspector.ResourceManager.prototype = {
didCreateWebSocket: function(identifier, requestURL)
{
- this.identifierForInitialRequest(identifier, requestURL);
- var resource = this._resourcesById[identifier];
+ var resource = this._createResource(identifier, requestURL);
resource.type = WebInspector.Resource.Type.WebSocket;
-
WebInspector.panels.network.refreshResource(resource);
},
@@ -473,7 +473,7 @@ WebInspector.ResourceManager.existingResourceViewForResource = function(resource
WebInspector.ResourceManager.getContent = function(resource, base64Encode, callback)
{
// FIXME: eventually, cached resources will have no identifiers.
- if (resource.loader)
+ if (Preferences.networkPanelEnabled)
InspectorBackend.resourceContent(resource.loader.frameId, resource.url, base64Encode, callback);
else
InspectorBackend.getResourceContent(resource.identifier, base64Encode, callback);
diff --git a/WebCore/inspector/front-end/Settings.js b/WebCore/inspector/front-end/Settings.js
index 124f736..b5f3984 100644
--- a/WebCore/inspector/front-end/Settings.js
+++ b/WebCore/inspector/front-end/Settings.js
@@ -45,7 +45,7 @@ var Preferences = {
onlineDetectionEnabled: true,
nativeInstrumentationEnabled: false,
resourceExportEnabled: false,
- networkPanelEnabled: false,
+ networkPanelEnabled: true,
fileSystemEnabled: false,
useDataURLForResourceImageIcons: true
}
diff --git a/WebCore/inspector/front-end/StoragePanel.js b/WebCore/inspector/front-end/StoragePanel.js
index 243eb83..0205f0a 100644
--- a/WebCore/inspector/front-end/StoragePanel.js
+++ b/WebCore/inspector/front-end/StoragePanel.js
@@ -59,7 +59,7 @@ WebInspector.StoragePanel = function(database)
this.sidebarTree.appendChild(this.applicationCacheListTreeElement);
if (Preferences.fileSystemEnabled) {
- this.fileSystemListTreeElement = new WebInspector.StorageCategoryTreeElement(this, WebInspector.UIString("File System"), "file-system-storage-tree-item");
+ this.fileSystemListTreeElement = new WebInspector.StorageCategoryTreeElement(this, WebInspector.UIString("File System"), "FileSystem", "file-system-storage-tree-item");
this.sidebarTree.appendChild(this.fileSystemListTreeElement);
this.fileSystemListTreeElement.expand();
}
@@ -74,6 +74,7 @@ WebInspector.StoragePanel = function(database)
this._databases = [];
this._domStorage = [];
this._cookieViews = {};
+ this._origins = {};
this._domains = {};
}
@@ -88,9 +89,21 @@ WebInspector.StoragePanel.prototype = {
return [this.storageViewStatusBarItemsContainer];
},
+ elementsToRestoreScrollPositionsFor: function()
+ {
+ return [this.sidebarElement];
+ },
+
show: function()
{
WebInspector.Panel.prototype.show.call(this);
+
+ if (this.visibleView instanceof WebInspector.ResourceView) {
+ // SourceViews are shared between the panels.
+ this.visibleView.headersVisible = true;
+ this.visibleView.show(this.storageViews);
+ }
+
if (this._initializedDefaultSelection)
return;
@@ -116,6 +129,7 @@ WebInspector.StoragePanel.prototype = {
reset: function()
{
+ this._origins = {};
this._domains = {};
for (var i = 0; i < this._databases.length; ++i) {
var database = this._databases[i];
@@ -198,11 +212,7 @@ WebInspector.StoragePanel.prototype = {
addResourceToFrame: function(frameId, resource)
{
- if (!this._domains[resource.domain]) {
- this._domains[resource.domain] = true;
- this.addCookieDomain(resource.domain);
- this.addApplicationCache(resource.domain);
- }
+ this.addDocumentURL(resource.documentURL);
if (resource.statusCode >= 301 && resource.statusCode <= 303)
return;
@@ -244,7 +254,8 @@ WebInspector.StoragePanel.prototype = {
// FIXME: do not add XHR in the first place based on the native instrumentation.
if (resource.type === WebInspector.Resource.Type.XHR) {
var resourceTreeElement = this._findTreeElementForResource(resource);
- resourceTreeElement.parent.removeChild(resourceTreeElement);
+ if (resourceTreeElement)
+ resourceTreeElement.parent.removeChild(resourceTreeElement);
}
},
@@ -256,11 +267,33 @@ WebInspector.StoragePanel.prototype = {
database._databasesTreeElement = databaseTreeElement;
this.databasesListTreeElement.appendChild(databaseTreeElement);
},
-
- addCookieDomain: function(domain)
+
+ addDocumentURL: function(url)
{
- var cookieDomainTreeElement = new WebInspector.CookieTreeElement(this, domain);
- this.cookieListTreeElement.appendChild(cookieDomainTreeElement);
+ var parsedURL = url.asParsedURL();
+ if (!parsedURL)
+ return;
+
+ var domain = parsedURL.host;
+ if (!this._domains[domain]) {
+ this._domains[domain] = true;
+
+ var cookieDomainTreeElement = new WebInspector.CookieTreeElement(this, domain);
+ this.cookieListTreeElement.appendChild(cookieDomainTreeElement);
+
+ var applicationCacheTreeElement = new WebInspector.ApplicationCacheTreeElement(this, domain);
+ this.applicationCacheListTreeElement.appendChild(applicationCacheTreeElement);
+ }
+
+ if (Preferences.fileSystemEnabled) {
+ // FIXME: This should match the SecurityOrigin::toString(), add a test for this.
+ var securityOrigin = parsedURL.scheme + "://" + parsedURL.host + (parsedURL.port ? (":" + parsedURL.port) : "");
+ if (!this._origins[securityOrigin]) {
+ this._origins[securityOrigin] = true;
+ var fileSystemTreeElement = new WebInspector.FileSystemTreeElement(this, securityOrigin);
+ this.fileSystemListTreeElement.appendChild(fileSystemTreeElement);
+ }
+ }
},
addDOMStorage: function(domStorage)
@@ -274,18 +307,6 @@ WebInspector.StoragePanel.prototype = {
this.sessionStorageListTreeElement.appendChild(domStorageTreeElement);
},
- addApplicationCache: function(domain)
- {
- var applicationCacheTreeElement = new WebInspector.ApplicationCacheTreeElement(this, domain);
- this.applicationCacheListTreeElement.appendChild(applicationCacheTreeElement);
- },
-
- addFileSystem: function(origin)
- {
- var fileSystemTreeElement = new WebInspector.FileSystemTreeElement(this, origin);
- this.fileSystemListTreeElement.appendChild(fileSystemTreeElement);
- },
-
selectDatabase: function(databaseId)
{
var database;
@@ -409,9 +430,9 @@ WebInspector.StoragePanel.prototype = {
this._applicationCacheView.updateStatus(this._cachedApplicationCacheViewStatus);
},
- showFileSystem: function(treeElement, fileSystemDomain)
+ showFileSystem: function(treeElement, origin)
{
- this._fileSystemView = new WebInspector.FileSystemView(treeElement, fileSystemDomain);
+ this._fileSystemView = new WebInspector.FileSystemView(treeElement, origin);
this._innerShowView(this._fileSystemView);
},
@@ -651,13 +672,13 @@ WebInspector.StoragePanel.prototype = {
{
function isAncestor(ancestor, object)
{
- console.error("There should be no calls to isAncestor, but there was one for ", object);
+ // Redirects, XHRs do not belong to the tree, it is fine to silently return false here.
return false;
}
function getParent(object)
{
- console.error("There should be no calls to getParent, but there was one for ", object);
+ // Redirects, XHRs do not belong to the tree, it is fine to silently return false here.
return null;
}
@@ -1070,16 +1091,22 @@ WebInspector.ApplicationCacheTreeElement.prototype = {
}
WebInspector.ApplicationCacheTreeElement.prototype.__proto__ = WebInspector.BaseStorageTreeElement.prototype;
-WebInspector.FileSystemTreeElement = function(storagePanel, fileSystemDomain)
+WebInspector.FileSystemTreeElement = function(storagePanel, origin)
{
- WebInspector.BaseStorageTreeElement.call(this, storagePanel, null, fileSystemDomain ? fileSystemDomain : WebInspector.UIString("Local Files"), "file-system-storage-tree-item");
- this._fileSystemDomain = fileSystemDomain;
+ WebInspector.BaseStorageTreeElement.call(this, storagePanel, null, origin, "file-system-storage-tree-item");
+ this._origin = origin;
}
WebInspector.FileSystemTreeElement.prototype = {
+ get itemURL()
+ {
+ return "file-system://" + encodeURI(this._origin);
+ },
+
onselect: function()
{
- this._storagePanel.showFileSystem(this, this._fileSystemDomain);
+ WebInspector.BaseStorageTreeElement.prototype.onselect.call(this);
+ this._storagePanel.showFileSystem(this, this._origin);
}
}
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index ef5239c..c89d90a 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -50,9 +50,6 @@
var WebInspector = {
resources: {},
- cookieDomains: {},
- applicationCacheDomains: {},
- fileSystemOrigins: {},
missingLocalizedStrings: {},
pendingDispatches: 0,
@@ -556,7 +553,7 @@ WebInspector.doLoadedDone = function()
scripts: new WebInspector.ResourceCategory("scripts", WebInspector.UIString("Scripts"), "rgb(255,121,0)"),
xhr: new WebInspector.ResourceCategory("xhr", WebInspector.UIString("XHR"), "rgb(231,231,10)"),
fonts: new WebInspector.ResourceCategory("fonts", WebInspector.UIString("Fonts"), "rgb(255,82,62)"),
- websocket: new WebInspector.ResourceCategory("websockets", WebInspector.UIString("WebSocket"), "rgb(186,186,186)"), // FIXME: Decide the color.
+ websockets: new WebInspector.ResourceCategory("websockets", WebInspector.UIString("WebSocket"), "rgb(186,186,186)"), // FIXME: Decide the color.
other: new WebInspector.ResourceCategory("other", WebInspector.UIString("Other"), "rgb(186,186,186)")
};
@@ -1294,14 +1291,7 @@ WebInspector.updateResource = function(payload)
if (resource.mainResource)
this.mainResource = resource;
- var parsedURL = payload.documentURL.asParsedURL();
- if (parsedURL) {
- this._addCookieDomain(parsedURL.host);
- this._addAppCacheDomain(parsedURL.host);
- if (Preferences.fileSystemEnabled)
- // This should match the SecurityOrigin::toString(). FIXME: Add a test for this.
- this._addFileSystemOrigin(parsedURL.scheme + "://" + parsedURL.host + (parsedURL.port ? (":" + parsedURL.port) : ""));
- }
+ this.panels.storage.addDocumentURL(payload.documentURL);
}
if (payload.didResponseChange) {
@@ -1393,42 +1383,6 @@ WebInspector.addDatabase = function(payload)
this.panels.storage.addDatabase(database);
}
-WebInspector._addCookieDomain = function(domain)
-{
- // Eliminate duplicate domains from the list.
- if (domain in this.cookieDomains)
- return;
- this.cookieDomains[domain] = true;
-
- if (!this.panels.storage)
- return;
- this.panels.storage.addCookieDomain(domain);
-}
-
-WebInspector._addAppCacheDomain = function(domain)
-{
- // Eliminate duplicate domains from the list.
- if (domain in this.applicationCacheDomains)
- return;
- this.applicationCacheDomains[domain] = true;
-
- if (!this.panels.storage)
- return;
- this.panels.storage.addApplicationCache(domain);
-}
-
-WebInspector._addFileSystemOrigin = function(origin)
-{
- if (!this.panels.storage)
- return;
- // Eliminate duplicate origins.
- // FIXME: Move appcache/cookies/filesystem domain dup checks in StoragePanel.js
- if (origin in this.fileSystemOrigins)
- return;
- this.fileSystemOrigins[origin] = true;
- this.panels.storage.addFileSystem(origin);
-}
-
WebInspector.addDOMStorage = function(payload)
{
if (!this.panels.storage)
diff --git a/WebCore/inspector/front-end/networkPanel.css b/WebCore/inspector/front-end/networkPanel.css
index 215681f..2c683f0 100644
--- a/WebCore/inspector/front-end/networkPanel.css
+++ b/WebCore/inspector/front-end/networkPanel.css
@@ -22,7 +22,7 @@
-webkit-background-size: 1px 42px;
}
-.network.panel .data-grid td {
+.network.panel .data-grid td:not(.network-summary) {
line-height: 17px;
height: 37px;
border-right: 1px solid rgb(210, 210, 210);
@@ -487,7 +487,7 @@
height: 20px;
font-size: 11px;
font-weight: bold;
- padding-top: 1px;
+ padding-top: 3px;
padding-left: 10px;
z-index: 2000;
white-space: pre;
@@ -544,7 +544,7 @@
left: 0;
}
-.network-close-button {
+#network-close-button {
position: absolute;
width: 14px;
height: 14px;
@@ -555,6 +555,11 @@
top: 4px;
right: 5px;
z-index: 10;
+ display: none;
+}
+
+.network.panel.viewing-resource #network-close-button {
+ display: block;
}
.network.panel .data-grid.full-grid-mode .viewer-column {
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 2bcb4fd..07e4f70 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-31 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Timothy Hatcher.
+
+ Web Inspector: unhide new network and resources panels.
+ https://bugs.webkit.org/show_bug.cgi?id=48725
+
+ * src/WebDevToolsAgentImpl.cpp:
+ (WebKit::WebDevToolsAgentImpl::setApuAgentEnabled):
+
2010-10-29 Daniel Bates <dbates at rim.com>
No review, rolling out 70971.
diff --git a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
index 9b7b2bd..14d557f 100644
--- a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
+++ b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
@@ -264,19 +264,26 @@ void WebDevToolsAgentImpl::setApuAgentEnabled(bool enabled)
if (enabled) {
if (!ic->hasFrontend())
connectFrontend(true);
+
+#if LEGACY_RESOURCE_TRACKING_ENABLED
m_resourceTrackingWasEnabled = ic->resourceTrackingEnabled();
+#endif
ic->startTimelineProfiler();
+#if LEGACY_RESOURCE_TRACKING_ENABLED
if (!m_resourceTrackingWasEnabled) {
// TODO(knorton): Introduce some kind of agents dependency here so that
// user could turn off resource tracking while apu agent is on.
ic->setResourceTrackingEnabled(true);
}
+#endif
m_debuggerAgentImpl->setAutoContinueOnException(true);
} else {
ic->stopTimelineProfiler();
+#if LEGACY_RESOURCE_TRACKING_ENABLED
if (!m_resourceTrackingWasEnabled)
ic->setResourceTrackingEnabled(false);
m_resourceTrackingWasEnabled = false;
+#endif
}
m_client->runtimePropertyChanged(
kApuAgentFeatureName,
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list