[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:37 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 6beae5c08a3b05cf630032affc739a250e0b8d0f
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 25 09:50:25 2010 +0000
2010-10-24 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
Web Inspector: slowly make old resources panel optional.
https://bugs.webkit.org/show_bug.cgi?id=48207
* inspector/front-end/AuditsPanel.js:
(WebInspector.AuditsPanel.prototype._reloadResources):
(WebInspector.AuditsPanel.prototype.show):
* inspector/front-end/ExtensionServer.js:
(WebInspector.ExtensionServer.prototype._onRevealAndSelectResource):
* inspector/front-end/ResourcesPanel.js:
* inspector/front-end/ScriptsPanel.js:
(WebInspector.ScriptsPanel.prototype._sourceFrameForScriptOrResource):
(WebInspector.ScriptsPanel.prototype._sourceFrameForResource):
* inspector/front-end/inspector.js:
(WebInspector._createPanels):
(WebInspector.doLoadedDone.populateInspectorState):
(WebInspector.doLoadedDone):
(WebInspector.openResource):
(WebInspector.updateResource):
(WebInspector.domContentEventFired):
(WebInspector.loadEventFired):
(WebInspector.removeResource):
(WebInspector.displayNameForURL):
(WebInspector._choosePanelToShowSourceLine):
(WebInspector.doPerformSearch):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70446 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 58b8102..756fa8d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,35 @@
Reviewed by Timothy Hatcher.
+ Web Inspector: slowly make old resources panel optional.
+ https://bugs.webkit.org/show_bug.cgi?id=48207
+
+ * inspector/front-end/AuditsPanel.js:
+ (WebInspector.AuditsPanel.prototype._reloadResources):
+ (WebInspector.AuditsPanel.prototype.show):
+ * inspector/front-end/ExtensionServer.js:
+ (WebInspector.ExtensionServer.prototype._onRevealAndSelectResource):
+ * inspector/front-end/ResourcesPanel.js:
+ * inspector/front-end/ScriptsPanel.js:
+ (WebInspector.ScriptsPanel.prototype._sourceFrameForScriptOrResource):
+ (WebInspector.ScriptsPanel.prototype._sourceFrameForResource):
+ * inspector/front-end/inspector.js:
+ (WebInspector._createPanels):
+ (WebInspector.doLoadedDone.populateInspectorState):
+ (WebInspector.doLoadedDone):
+ (WebInspector.openResource):
+ (WebInspector.updateResource):
+ (WebInspector.domContentEventFired):
+ (WebInspector.loadEventFired):
+ (WebInspector.removeResource):
+ (WebInspector.displayNameForURL):
+ (WebInspector._choosePanelToShowSourceLine):
+ (WebInspector.doPerformSearch):
+
+2010-10-24 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Timothy Hatcher.
+
Web Inspector: add support for errors, warnings and search to the storage panel.
https://bugs.webkit.org/show_bug.cgi?id=48206
diff --git a/WebCore/inspector/front-end/AuditsPanel.js b/WebCore/inspector/front-end/AuditsPanel.js
index f6cbed0..82be58f 100644
--- a/WebCore/inspector/front-end/AuditsPanel.js
+++ b/WebCore/inspector/front-end/AuditsPanel.js
@@ -205,7 +205,7 @@ WebInspector.AuditsPanel.prototype = {
{
this._resourceTrackingCallback = callback;
- if (!WebInspector.panels.resources.resourceTrackingEnabled) {
+ if (WebInspector.panels.resources && !WebInspector.panels.resources.resourceTrackingEnabled) {
InspectorBackend.enableResourceTracking(false);
this._updateLauncherViewControls(true);
} else
@@ -256,7 +256,7 @@ WebInspector.AuditsPanel.prototype = {
show: function()
{
WebInspector.Panel.prototype.show.call(this);
- this._updateLauncherViewControls(WebInspector.panels.resources.resourceTrackingEnabled);
+ this._updateLauncherViewControls(!WebInspector.panels.resources || WebInspector.panels.resources.resourceTrackingEnabled);
},
reset: function()
diff --git a/WebCore/inspector/front-end/ExtensionServer.js b/WebCore/inspector/front-end/ExtensionServer.js
index 9ab4c0c..4fd69cf 100644
--- a/WebCore/inspector/front-end/ExtensionServer.js
+++ b/WebCore/inspector/front-end/ExtensionServer.js
@@ -243,8 +243,13 @@ WebInspector.ExtensionServer.prototype = {
resource = WebInspector.resources[id] || WebInspector.resourceForURL(id);
if (!resource)
return this._status.E_NOTFOUND(typeof id + ": " + id);
- WebInspector.panels.resources.showResource(resource, message.line);
- WebInspector.showPanel("resources");
+ if (Preferences.networkPanelEnabled) {
+ WebInspector.panels.storage.showResource(resource, message.line);
+ WebInspector.showPanel("storage");
+ } else {
+ WebInspector.panels.resources.showResource(resource, message.line);
+ WebInspector.showPanel("resources");
+ }
},
_dispatchCallback: function(requestId, port, result)
diff --git a/WebCore/inspector/front-end/ResourcesPanel.js b/WebCore/inspector/front-end/ResourcesPanel.js
index 3976e07..2cb399b 100644
--- a/WebCore/inspector/front-end/ResourcesPanel.js
+++ b/WebCore/inspector/front-end/ResourcesPanel.js
@@ -909,23 +909,6 @@ WebInspector.ResourcesPanel.prototype = {
this.updateSidebarWidth();
},
- sourceFrameForResource: function(resource)
- {
- var view = WebInspector.ResourceManager.resourceViewForResource(resource);
- if (!view)
- return null;
-
- if (!view.setupSourceFrameIfNeeded)
- return null;
-
- // Setting up the source frame requires that we be attached.
- if (!this.element.parentNode)
- this.attach();
-
- view.setupSourceFrameIfNeeded();
- return view.sourceFrame;
- },
-
_sortResourcesIfNeeded: function()
{
this.sortItems(this.sortingFunction);
diff --git a/WebCore/inspector/front-end/ScriptsPanel.js b/WebCore/inspector/front-end/ScriptsPanel.js
index 2f1628d..d6f86b6 100644
--- a/WebCore/inspector/front-end/ScriptsPanel.js
+++ b/WebCore/inspector/front-end/ScriptsPanel.js
@@ -570,11 +570,24 @@ WebInspector.ScriptsPanel.prototype = {
_sourceFrameForScriptOrResource: function(scriptOrResource)
{
if (scriptOrResource instanceof WebInspector.Resource)
- return WebInspector.panels.resources.sourceFrameForResource(scriptOrResource);
+ return this._sourceFrameForResource(scriptOrResource);
if (scriptOrResource instanceof WebInspector.Script)
return this.sourceFrameForScript(scriptOrResource);
},
+ _sourceFrameForResource: function(resource)
+ {
+ var view = WebInspector.ResourceManager.resourceViewForResource(resource);
+ if (!view)
+ return null;
+
+ if (!view.setupSourceFrameIfNeeded)
+ return null;
+
+ view.setupSourceFrameIfNeeded();
+ return view.sourceFrame;
+ },
+
_showScriptOrResource: function(scriptOrResource, options)
{
// options = {line:, shouldHighlightLine:, fromBackForwardAction:, initialLoad:}
diff --git a/WebCore/inspector/front-end/Settings.js b/WebCore/inspector/front-end/Settings.js
index 7a31edf..c6da14d 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: true
+ networkPanelEnabled: false
}
WebInspector.Settings = function(sessionScope)
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index 6ed47ef..8936741 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -228,8 +228,15 @@ var WebInspector = {
this.panels.elements = new WebInspector.ElementsPanel();
if (Preferences.networkPanelEnabled && hiddenPanels.indexOf("network") === -1)
this.panels.network = new WebInspector.NetworkPanel();
- if (hiddenPanels.indexOf("resources") === -1)
+
+ if (Preferences.networkPanelEnabled) {
+ if (hiddenPanels.indexOf("storage") === -1 && hiddenPanels.indexOf("databases") === -1)
+ this.panels.storage = new WebInspector.StoragePanel();
+ if (hiddenPanels.indexOf("network") === -1)
+ this.panels.network = new WebInspector.NetworkPanel();
+ } else if (hiddenPanels.indexOf("resources") === -1)
this.panels.resources = new WebInspector.ResourcesPanel();
+
if (hiddenPanels.indexOf("scripts") === -1)
this.panels.scripts = new WebInspector.ScriptsPanel();
if (hiddenPanels.indexOf("timeline") === -1)
@@ -240,8 +247,12 @@ var WebInspector = {
if (Preferences.heapProfilerPresent)
this.panels.profiles.registerProfileType(new WebInspector.HeapSnapshotProfileType());
}
- if (hiddenPanels.indexOf("storage") === -1 && hiddenPanels.indexOf("databases") === -1)
- this.panels.storage = new WebInspector.StoragePanel();
+
+ if (!Preferences.networkPanelEnabled) {
+ if (hiddenPanels.indexOf("storage") === -1 && hiddenPanels.indexOf("databases") === -1)
+ this.panels.storage = new WebInspector.StoragePanel();
+ }
+
if (hiddenPanels.indexOf("audits") === -1)
this.panels.audits = new WebInspector.AuditsPanel();
if (hiddenPanels.indexOf("console") === -1)
@@ -536,6 +547,11 @@ WebInspector.doLoadedDone = function()
for (var panelName in this.panels)
previousToolbarItem = WebInspector.addPanelToolbarIcon(toolbarElement, this.panels[panelName], previousToolbarItem);
+ if (Preferences.networkPanelEnabled) {
+ this.panels.storage._toolbarItem.removeStyleClass("storage");
+ this.panels.storage._toolbarItem.addStyleClass("resources");
+ }
+
this.Tips = {
ResourceNotCompressed: {id: 0, message: WebInspector.UIString("You could save bandwidth by having your web server compress this transfer with gzip or zlib.")}
};
@@ -588,10 +604,12 @@ WebInspector.doLoadedDone = function()
WebInspector.monitoringXHREnabled = inspectorState.monitoringXHREnabled;
if ("pauseOnExceptionsState" in inspectorState)
WebInspector.panels.scripts.updatePauseOnExceptionsState(inspectorState.pauseOnExceptionsState);
- if (inspectorState.resourceTrackingEnabled)
- WebInspector.panels.resources.resourceTrackingWasEnabled();
- else
- WebInspector.panels.resources.resourceTrackingWasDisabled();
+ if (WebInspector.panels.resources) {
+ if (inspectorState.resourceTrackingEnabled)
+ WebInspector.panels.resources.resourceTrackingWasEnabled();
+ else
+ WebInspector.panels.resources.resourceTrackingWasDisabled();
+ }
}
InspectorBackend.getInspectorState(populateInspectorState);
@@ -794,8 +812,13 @@ WebInspector.openResource = function(resourceURL, inResourcesPanel)
{
var resource = WebInspector.resourceForURL(resourceURL);
if (inResourcesPanel && resource) {
- WebInspector.panels.resources.showResource(resource);
- WebInspector.showPanel("resources");
+ if (Preferences.networkPanelEnabled) {
+ WebInspector.panels.storage.showResource(resource);
+ WebInspector.showPanel("storage");
+ } else {
+ WebInspector.panels.resources.showResource(resource);
+ WebInspector.showPanel("resources");
+ }
} else
InspectorBackend.openInInspectedWindow(resource ? resource.url : resourceURL);
}
@@ -1214,6 +1237,9 @@ WebInspector.selectDOMStorage = function(o)
WebInspector.updateResource = function(payload)
{
+ if (Preferences.networkPanelEnabled)
+ return;
+
var identifier = payload.id;
var resource = this.resources[identifier];
if (!resource) {
@@ -1286,7 +1312,8 @@ WebInspector.updateResource = function(payload)
WebInspector.domContentEventFired = function(time)
{
- this.panels.resources.mainResourceDOMContentTime = time;
+ if (this.panels.resources)
+ this.panels.resources.mainResourceDOMContentTime = time;
this.panels.audits.mainResourceDOMContentTime = time;
if (this.panels.network)
this.panels.network.mainResourceDOMContentTime = time;
@@ -1294,7 +1321,8 @@ WebInspector.domContentEventFired = function(time)
WebInspector.loadEventFired = function(time)
{
- this.panels.resources.mainResourceLoadTime = time;
+ if (this.panels.resources)
+ this.panels.resources.mainResourceLoadTime = time;
this.panels.audits.mainResourceLoadTime = time;
if (this.panels.network)
this.panels.network.mainResourceLoadTime = time;
@@ -1302,6 +1330,9 @@ WebInspector.loadEventFired = function(time)
WebInspector.removeResource = function(identifier)
{
+ if (Preferences.networkPanelEnabled)
+ return;
+
var resource = this.resources[identifier];
if (!resource)
return;
@@ -1669,6 +1700,13 @@ WebInspector.displayNameForURL = function(url)
{
if (!url)
return "";
+
+ if (WebInspector.resourceManager) {
+ var resource = WebInspector.resourceManager.resourceForURL(url);
+ if (resource)
+ return resource.displayName;
+ }
+
var resource = this.resourceURLMap[url];
if (resource)
return resource.displayName;
@@ -1705,10 +1743,13 @@ WebInspector.resourceForURL = function(url)
WebInspector._choosePanelToShowSourceLine = function(url, line, preferredPanel)
{
preferredPanel = preferredPanel || "resources";
+ if (Preferences.networkPanelEnabled && preferredPanel === "resources")
+ preferredPanel = "storage";
+
var panel = this.panels[preferredPanel];
if (panel && panel.canShowSourceLine(url, line))
return panel;
- panel = this.panels.resources;
+ panel = Preferences.networkPanelEnabled ? this.panels.storage : this.panels.resources;
return panel.canShowSourceLine(url, line) ? panel : null;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list