Changeset 70446 in webkit

Timestamp:

Oct 25, 2010 2:50:25 AM (14 years ago)

Author:

pfeldman@chromium.org

Message:

2010-10-24 Pavel Feldman <​pfeldman@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):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/AuditsPanel.js (modified) (2 diffs)
• inspector/front-end/ExtensionServer.js (modified) (1 diff)
• inspector/front-end/ResourcesPanel.js (modified) (1 diff)
• inspector/front-end/ScriptsPanel.js (modified) (1 diff)
• inspector/front-end/Settings.js (modified) (1 diff)
• inspector/front-end/inspector.js (modified) (11 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-24  Pavel Feldman  <pfeldman@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):
+
 2010-10-24  Pavel Feldman  <pfeldman@chromium.org>
 

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

@@ -206 +206 @@
         this._resourceTrackingCallback = callback;
 
-        if (!WebInspector.panels.resources.resourceTrackingEnabled) {
+        if (WebInspector.panels.resources && !WebInspector.panels.resources.resourceTrackingEnabled) {
             InspectorBackend.enableResourceTracking(false);
             this._updateLauncherViewControls(true);
@@ -257 +257 @@
     {
         WebInspector.Panel.prototype.show.call(this);
-        this._updateLauncherViewControls(WebInspector.panels.resources.resourceTrackingEnabled);
+        this._updateLauncherViewControls(!WebInspector.panels.resources || WebInspector.panels.resources.resourceTrackingEnabled);
     },
 

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

@@ -244 +244 @@
         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");
+        }
     },
 

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

@@ -910 +910 @@
     },
 
-    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()
     {

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

@@ -571 +571 @@
     {
         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;
     },
 

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

@@ -46 +46 @@
     nativeInstrumentationEnabled: false,
     resourceExportEnabled: false,
-    networkPanelEnabled: true
+    networkPanelEnabled: false
 }
 

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

@@ -229 +229 @@
         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();
@@ -241 +248 @@
                 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();
@@ -537 +548 @@
         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.")}
@@ -589 +605 @@
         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);
@@ -795 +813 @@
     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);
@@ -1215 +1238 @@
 WebInspector.updateResource = function(payload)
 {
+    if (Preferences.networkPanelEnabled)
+        return;
+
     var identifier = payload.id;
     var resource = this.resources[identifier];
@@ -1287 +1313 @@
 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)
@@ -1295 +1322 @@
 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)
@@ -1303 +1331 @@
 WebInspector.removeResource = function(identifier)
 {
+    if (Preferences.networkPanelEnabled)
+        return;
+
     var resource = this.resources[identifier];
     if (!resource)
@@ -1670 +1701 @@
     if (!url)
         return "";
+
+    if (WebInspector.resourceManager) {
+        var resource = WebInspector.resourceManager.resourceForURL(url);
+        if (resource)
+            return resource.displayName;
+    }
+
     var resource = this.resourceURLMap[url];
     if (resource)
@@ -1706 +1744 @@
 {
     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;
 }