Changeset 101381 in webkit

Timestamp:

Nov 29, 2011 8:01:30 AM (12 years ago)

Author:

pfeldman@chromium.org

Message:

Web Inspector: split Preferences into Preferences and Capabilities.
​https://bugs.webkit.org/show_bug.cgi?id=73321

Source/WebCore:

Part of the Preferences defined in Settings.js are in fact backend capabilities.
Split them into two separate objects for further capabilities refactoring.

Reviewed by Yury Semikhatsky.

• inspector/front-end/DebuggerModel.js:
• inspector/front-end/ElementsPanel.js:

(WebInspector.ElementsPanel):
(WebInspector.ElementsPanel.prototype.wasShown):
(WebInspector.ElementsPanel.prototype._populateContextMenu):

• inspector/front-end/NetworkItemView.js:

(WebInspector.NetworkItemView):

• inspector/front-end/NetworkPanel.js:

(WebInspector.NetworkLogView.prototype._createTable):
(WebInspector.NetworkLogView.prototype.switchToDetailedView):
(WebInspector.NetworkLogView.prototype.switchToBriefView):
(WebInspector.NetworkLogView.prototype._contextMenu):
(WebInspector.NetworkDataGridNode.prototype.createCells):
(WebInspector.NetworkDataGridNode.prototype.refreshResource):

• inspector/front-end/ProfileDataGridTree.js:

(WebInspector.ProfileDataGridNode.prototype.get data.formatMilliseconds):

• inspector/front-end/ProfileView.js:
• inspector/front-end/ProfilesPanel.js:

(WebInspector.ProfilesPanel.prototype._enableDetailedHeapProfiles):

• inspector/front-end/Resource.js:

(WebInspector.Resource.prototype.populateImageSource):

• inspector/front-end/ScriptsPanel.js:

(WebInspector.ScriptsPanel.prototype.wasShown):
(WebInspector.ScriptsPanel.prototype._clearInterface):

• inspector/front-end/Settings.js:
• inspector/front-end/SettingsScreen.js:

(WebInspector.SettingsScreen):

• inspector/front-end/StylesSidebarPane.js:
• inspector/front-end/inspector.js:

Source/WebKit/chromium:

Reviewed by Yury Semikhatsky.

• src/js/DevTools.js:

Location:

trunk

Files:

• LayoutTests/inspector/profiler/detailed-heapshots-test.js (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/DebuggerModel.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/ElementsPanel.js (modified) (4 diffs)
• Source/WebCore/inspector/front-end/NetworkItemView.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/NetworkPanel.js (modified) (9 diffs)
• Source/WebCore/inspector/front-end/ProfileDataGridTree.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/ProfileView.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/ProfilesPanel.js (modified) (3 diffs)
• Source/WebCore/inspector/front-end/Resource.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/ScriptsPanel.js (modified) (7 diffs)
• Source/WebCore/inspector/front-end/Settings.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/SettingsScreen.js (modified) (2 diffs)
• Source/WebCore/inspector/front-end/StylesSidebarPane.js (modified) (2 diffs)
• Source/WebCore/inspector/front-end/inspector.js (modified) (1 diff)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/src/js/DevTools.js (modified) (1 diff)

trunk/LayoutTests/inspector/profiler/detailed-heapshots-test.js

@@ -14 +14 @@
         InspectorTest.addSniffer(WebInspector.DetailedHeapshotView.prototype, "_updatePercentButton", InspectorTest._snapshotViewShown, true);
 
-        if (Preferences.detailedHeapProfiles)
+        if (Capabilities.detailedHeapProfiles)
             detailedHeapProfilesEnabled();
         else {
@@ -63 +63 @@
 InspectorTest.runDetailedHeapshotTestSuite = function(testSuite)
 {
-    if (!Preferences.heapProfilerPresent) {
+    if (!Capabilities.heapProfilerPresent) {
         InspectorTest.addResult("Heap profiler is disabled");
         InspectorTest.completeTest();

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-29  Pavel Feldman  <pfeldman@google.com>
+
+        Web Inspector: split Preferences into Preferences and Capabilities.
+        https://bugs.webkit.org/show_bug.cgi?id=73321
+
+        Part of the Preferences defined in Settings.js are in fact backend capabilities.
+        Split them into two separate objects for further capabilities refactoring.
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/front-end/DebuggerModel.js:
+        * inspector/front-end/ElementsPanel.js:
+        (WebInspector.ElementsPanel):
+        (WebInspector.ElementsPanel.prototype.wasShown):
+        (WebInspector.ElementsPanel.prototype._populateContextMenu):
+        * inspector/front-end/NetworkItemView.js:
+        (WebInspector.NetworkItemView):
+        * inspector/front-end/NetworkPanel.js:
+        (WebInspector.NetworkLogView.prototype._createTable):
+        (WebInspector.NetworkLogView.prototype.switchToDetailedView):
+        (WebInspector.NetworkLogView.prototype.switchToBriefView):
+        (WebInspector.NetworkLogView.prototype._contextMenu):
+        (WebInspector.NetworkDataGridNode.prototype.createCells):
+        (WebInspector.NetworkDataGridNode.prototype.refreshResource):
+        * inspector/front-end/ProfileDataGridTree.js:
+        (WebInspector.ProfileDataGridNode.prototype.get data.formatMilliseconds):
+        * inspector/front-end/ProfileView.js:
+        * inspector/front-end/ProfilesPanel.js:
+        (WebInspector.ProfilesPanel.prototype._enableDetailedHeapProfiles):
+        * inspector/front-end/Resource.js:
+        (WebInspector.Resource.prototype.populateImageSource):
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel.prototype.wasShown):
+        (WebInspector.ScriptsPanel.prototype._clearInterface):
+        * inspector/front-end/Settings.js:
+        * inspector/front-end/SettingsScreen.js:
+        (WebInspector.SettingsScreen):
+        * inspector/front-end/StylesSidebarPane.js:
+        * inspector/front-end/inspector.js:
+
 2011-11-29  Simon Hausmann  <simon.hausmann@nokia.com>
 

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

@@ -90 +90 @@
         /**
          * @param {Protocol.Error} error
-         * @param {Array.<string>} capabilities
+         * @param {Array.<MetaAgent.DomainCapabilities>} capabilities
          */
         function callback(error, capabilities)

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

@@ -71 +71 @@
     this.sidebarPanes.metrics = new WebInspector.MetricsSidebarPane();
     this.sidebarPanes.properties = new WebInspector.PropertiesSidebarPane();
-    if (Preferences.nativeInstrumentationEnabled)
+    if (Capabilities.nativeInstrumentationEnabled)
         this.sidebarPanes.domBreakpoints = WebInspector.domBreakpointsSidebarPane;
     this.sidebarPanes.eventListeners = new WebInspector.EventListenersSidebarPane();
@@ -138 +138 @@
             WebInspector.domAgent.requestDocument();
 
-        if (Preferences.nativeInstrumentationEnabled)
+        if (Capabilities.nativeInstrumentationEnabled)
             this.sidebarElement.insertBefore(this.sidebarPanes.domBreakpoints.element, this.sidebarPanes.eventListeners.element);
     },
@@ -202 +202 @@
         }
 
-        if (Preferences.nativeInstrumentationEnabled)
+        if (Capabilities.nativeInstrumentationEnabled)
             this.sidebarPanes.domBreakpoints.restoreBreakpoints();
 
@@ -320 +320 @@
     _populateContextMenu: function(contextMenu, node)
     {
-        if (Preferences.nativeInstrumentationEnabled) {
+        if (Capabilities.nativeInstrumentationEnabled) {
             // Add debbuging-related actions
             contextMenu.appendSeparator();

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

@@ -48 +48 @@
     this.appendTab("response", WebInspector.UIString("Response"), responseView);
 
-    if (Preferences.showCookiesTab) {
+    if (Capabilities.showCookiesTab) {
         this._cookiesView = new WebInspector.ResourceCookiesView(resource);
         this.appendTab("cookies", WebInspector.UIString("Cookies"), this._cookiesView);
     }
 
-    if (Preferences.showTimingTab) {
+    if (Capabilities.showTimingTab) {
         var timingView = new WebInspector.ResourceTimingView(resource);
         this.appendTab("timing", WebInspector.UIString("Timing"), timingView);

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

@@ -140 +140 @@
     {
         var columns;
-        if (Preferences.showNetworkPanelInitiatorColumn)
+        if (Capabilities.nativeInstrumentationEnabled)
             columns = {name: {}, method: {}, status: {}, type: {}, initiator: {}, size: {}, time: {}, timeline: {}};
         else
@@ -161 +161 @@
         columns.type.width = "6%";
 
-        if (Preferences.showNetworkPanelInitiatorColumn) {
+        if (Capabilities.nativeInstrumentationEnabled) {
             columns.initiator.title = WebInspector.UIString("Initiator");
             columns.initiator.sortable = true;
@@ -179 +179 @@
         columns.timeline.title = "";
         columns.timeline.sortable = false;
-        if (Preferences.showNetworkPanelInitiatorColumn)
+        if (Capabilities.nativeInstrumentationEnabled)
             columns.timeline.width = "40%";
         else
@@ -832 +832 @@
         this._dataGrid.showColumn("status");
         this._dataGrid.showColumn("type");
-        if (Preferences.showNetworkPanelInitiatorColumn)
+        if (Capabilities.nativeInstrumentationEnabled)
             this._dataGrid.showColumn("initiator");
         this._dataGrid.showColumn("size");
@@ -843 +843 @@
         widths.status = 6;
         widths.type = 6;
-        if (Preferences.showNetworkPanelInitiatorColumn)
+        if (Capabilities.nativeInstrumentationEnabled)
             widths.initiator = 10;
         widths.size = 6;
         widths.time = 6;
-        if (Preferences.showNetworkPanelInitiatorColumn)
+        if (Capabilities.nativeInstrumentationEnabled)
             widths.timeline = 40;
         else
@@ -863 +863 @@
         this._dataGrid.hideColumn("status");
         this._dataGrid.hideColumn("type");
-        if (Preferences.showNetworkPanelInitiatorColumn)
+        if (Capabilities.nativeInstrumentationEnabled)
             this._dataGrid.hideColumn("initiator");
         this._dataGrid.hideColumn("size");
@@ -941 +941 @@
         }
 
-        if (Preferences.canClearCacheAndCookies) {
+        if (Capabilities.canClearCacheAndCookies) {
             contextMenu.appendSeparator();
             contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Clear browser cache" : "Clear Browser Cache"), this._clearBrowserCache.bind(this));
@@ -1687 +1687 @@
         this._statusCell = this._createDivInTD("status");
         this._typeCell = this._createDivInTD("type");
-        if (Preferences.showNetworkPanelInitiatorColumn)
+        if (Capabilities.nativeInstrumentationEnabled)
             this._initiatorCell = this._createDivInTD("initiator");
         this._sizeCell = this._createDivInTD("size");
@@ -1781 +1781 @@
         this._refreshStatusCell();
         this._refreshTypeCell();
-        if (Preferences.showNetworkPanelInitiatorColumn)
+        if (Capabilities.nativeInstrumentationEnabled)
             this._refreshInitiatorCell();
         this._refreshSizeCell();

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

@@ -51 +51 @@
         function formatMilliseconds(time)
         {
-            return Number.secondsToString(time / 1000, !Preferences.samplingCPUProfiler);
+            return Number.secondsToString(time / 1000, !Capabilities.samplingCPUProfiler);
         }
 

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

@@ -43 +43 @@
                     "function": { title: WebInspector.UIString("Function"), disclosure: true, sortable: true } };
 
-    if (Preferences.samplingCPUProfiler) {
+    if (Capabilities.samplingCPUProfiler) {
         delete columns.average;
         delete columns.calls;

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

@@ -120 +120 @@
     this.enableToggleButton = new WebInspector.StatusBarButton("", "enable-toggle-status-bar-item");
     this.enableToggleButton.addEventListener("click", this._toggleProfiling.bind(this), false);
-    if (Preferences.profilerAlwaysEnabled)
+    if (Capabilities.profilerAlwaysEnabled)
         this.enableToggleButton.element.addStyleClass("hidden");
 
@@ -132 +132 @@
 
     this._profiles = [];
-    this._profilerEnabled = Preferences.profilerAlwaysEnabled;
+    this._profilerEnabled = Capabilities.profilerAlwaysEnabled;
     this._reset();
 
     this._registerProfileType(new WebInspector.CPUProfileType());
-    if (Preferences.heapProfilerPresent)
+    if (Capabilities.heapProfilerPresent)
         this._registerProfileType(new WebInspector.DetailedHeapshotProfileType());
 
     InspectorBackend.registerProfilerDispatcher(new WebInspector.ProfilerDispatcher(this));
 
-    if (Preferences.profilerAlwaysEnabled || WebInspector.settings.profilerEnabled.get())
+    if (Capabilities.profilerAlwaysEnabled || WebInspector.settings.profilerEnabled.get())
         ProfilerAgent.enable();
     else {
@@ -890 +890 @@
         profileType.treeElement = oldProfileType.treeElement;
         this._profileTypesByIdMap[profileType.id] = profileType;
-        Preferences.detailedHeapProfiles = true;
+        Capabilities.detailedHeapProfiles = true;
         this.detach();
         this.show();

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

@@ -892 +892 @@
         }
 
-        if (Preferences.useDataURLForResourceImageIcons)
-            this.requestContent(onResourceContent.bind(this));
-        else
-            image.src = this.url;
+        this.requestContent(onResourceContent.bind(this));
     },
 

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

@@ -69 +69 @@
     this.sidebarPanes.scopechain = new WebInspector.ScopeChainSidebarPane();
     this.sidebarPanes.jsBreakpoints = new WebInspector.JavaScriptBreakpointsSidebarPane(this._presentationModel, this._showSourceLine.bind(this));
-    if (Preferences.nativeInstrumentationEnabled) {
+    if (Capabilities.nativeInstrumentationEnabled) {
         this.sidebarPanes.domBreakpoints = WebInspector.domBreakpointsSidebarPane;
         this.sidebarPanes.xhrBreakpoints = new WebInspector.XHRBreakpointsSidebarPane();
@@ -75 +75 @@
     }
 
-    if (Preferences.canInspectWorkers && !WebInspector.WorkerManager.isWorkerFrontend()) {
+    if (Capabilities.canInspectWorkers && !WebInspector.WorkerManager.isWorkerFrontend()) {
         WorkerAgent.setWorkerInspectionEnabled(true);
         this.sidebarPanes.workerList = new WebInspector.WorkerListSidebarPane(WebInspector.workerManager);
@@ -104 +104 @@
     this.enableToggleButton = new WebInspector.StatusBarButton("", "enable-toggle-status-bar-item");
     this.enableToggleButton.addEventListener("click", this.toggleDebugging, this);
-    if (Preferences.debuggerAlwaysEnabled)
+    if (Capabilities.debuggerAlwaysEnabled)
         this.enableToggleButton.element.addStyleClass("hidden");
 
@@ -117 +117 @@
     this._scriptViewStatusBarItemsContainer.style.display = "inline-block";
 
-    this._debuggerEnabled = Preferences.debuggerAlwaysEnabled;
+    this._debuggerEnabled = Capabilities.debuggerAlwaysEnabled;
 
     this._reset(false);
@@ -138 +138 @@
     this._presentationModel.addEventListener(WebInspector.DebuggerPresentationModel.Events.DebuggerReset, this._reset.bind(this, false));
     
-    var enableDebugger = Preferences.debuggerAlwaysEnabled || WebInspector.settings.debuggerEnabled.get();
+    var enableDebugger = Capabilities.debuggerAlwaysEnabled || WebInspector.settings.debuggerEnabled.get();
     if (enableDebugger)
         WebInspector.debuggerModel.enableDebugger();
@@ -178 +178 @@
     {
         WebInspector.Panel.prototype.wasShown.call(this);
-        if (Preferences.nativeInstrumentationEnabled)
+        if (Capabilities.nativeInstrumentationEnabled)
             this.sidebarElement.insertBefore(this.sidebarPanes.domBreakpoints.element, this.sidebarPanes.xhrBreakpoints.element);
         this.sidebarPanes.watchExpressions.show();
@@ -803 +803 @@
         this.sidebarPanes.scopechain.update(null);
         this.sidebarPanes.jsBreakpoints.clearBreakpointHighlight();
-        if (Preferences.nativeInstrumentationEnabled) {
+        if (Capabilities.nativeInstrumentationEnabled) {
             this.sidebarPanes.domBreakpoints.clearBreakpointHighlight();
             this.sidebarPanes.eventListenerBreakpoints.clearBreakpointHighlight();

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

@@ -38 +38 @@
     styleRulesExpandedState: {},
     showMissingLocalizedStrings: false,
+    showColorNicknames: true,
+    saveAsAvailable: false,
+    useLowerCaseMenuTitlesOnWindows: false,
+    hasExtensions: false,
+    sharedWorkersDebugNote: undefined,
+    localizeUI: true,
+    applicationTitle: "Web Inspector - %s"
+}
+
+var Capabilities = {
     samplingCPUProfiler: false,
-    showColorNicknames: true,
     debuggerAlwaysEnabled: false,
     profilerAlwaysEnabled: false,
     nativeInstrumentationEnabled: false,
-    useDataURLForResourceImageIcons: true,
     showTimingTab: false,
     showCookiesTab: false,
-    debugMode: false,
     heapProfilerPresent: false,
     detailedHeapProfiles: false,
-    saveAsAvailable: false,
-    useLowerCaseMenuTitlesOnWindows: false,
     canInspectWorkers: false,
     canClearCacheAndCookies: false,
-    canDisableCache: false,
-    showNetworkPanelInitiatorColumn: false,
-    haveExtensions: false,
-    sharedWorkersDebugNote: undefined,
-    localizeUI: true,
-    applicationTitle: "Web Inspector - %s"
+    canDisableCache: false
 }
 

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

@@ -60 +60 @@
 
     p = this._appendSection(WebInspector.UIString("Network"), true);
-    if (Preferences.canDisableCache)
+    if (Capabilities.canDisableCache)
         p.appendChild(this._createCheckboxSetting(WebInspector.UIString("Disable cache"), WebInspector.settings.cacheDisabled));
     p.appendChild(this._createUserActionControl());
@@ -72 +72 @@
     p.appendChild(this._createCheckboxSetting(WebInspector.UIString("Preserve log upon navigation"), WebInspector.settings.preserveConsoleLog));
 
-    if (Preferences.haveExtensions) {
+    if (Preferences.hasExtensions) {
         var handlerSelector = new WebInspector.HandlerSelector(WebInspector.openAnchorLocationRegistry);
         p = this._appendSection(WebInspector.UIString("Extensions"), true);

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

@@ -890 +890 @@
     this._selectorElement.textContent = styleRule.selectorText;
     selectorContainer.appendChild(this._selectorElement);
-    if (Preferences.debugMode)
-        this._selectorElement.addEventListener("click", this._debugShowStyle.bind(this), false);
 
     var openBrace = document.createElement("span");
@@ -1134 +1132 @@
         item.updateTitle();
         return item;
-    },
-
-    _debugShowStyle: function(event)
-    {
-        var boundHandler;
-        function removeStyleBox(element, event)
-        {
-            if (event.target === element) {
-                event.stopPropagation();
-                return;
-            }
-            document.body.removeChild(element);
-            document.getElementById("main").removeEventListener("mousedown", boundHandler, true);
-        }
-
-        if (!event.shiftKey)
-            return;
-
-        var container = document.createElement("div");
-        var element = document.createElement("span");
-        container.appendChild(element);
-        element.style.background = "yellow";
-        element.style.display = "inline-block";
-        container.style.cssText = "z-index: 2000000; position: absolute; top: 50px; left: 50px; white-space: pre; overflow: auto; background: white; font-family: monospace; font-size: 12px; border: 1px solid black; opacity: 0.85; -webkit-user-select: text; padding: 2px;";
-        container.style.width = (document.body.offsetWidth - 100) + "px";
-        container.style.height = (document.body.offsetHeight - 100) + "px";
-        document.body.appendChild(container);
-        if (this.rule)
-            element.textContent = this.rule.selectorText + " {" + ((this.styleRule.style.cssText !== undefined) ? this.styleRule.style.cssText : "<no cssText>") + "}";
-        else
-            element.textContent = this.styleRule.style.cssText;
-        boundHandler = removeStyleBox.bind(null, container);
-        document.getElementById("main").addEventListener("mousedown", boundHandler, true);
     },
 

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

@@ -359 +359 @@
     this.advancedSearchController = new WebInspector.AdvancedSearchController();
 
-    if (Preferences.nativeInstrumentationEnabled)
+    if (Capabilities.nativeInstrumentationEnabled)
         this.domBreakpointsSidebarPane = new WebInspector.DOMBreakpointsSidebarPane();
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-11-29  Pavel Feldman  <pfeldman@google.com>
+
+        Web Inspector: split Preferences into Preferences and Capabilities.
+        https://bugs.webkit.org/show_bug.cgi?id=73321
+
+        Reviewed by Yury Semikhatsky.
+
+        * src/js/DevTools.js:
+
 2011-11-29  Jing Zhao  <jingzhao@chromium.org>
 

trunk/Source/WebKit/chromium/src/js/DevTools.js

@@ -36 +36 @@
 {(function () {
     Preferences.ignoreWhitespace = false;
-    Preferences.samplingCPUProfiler = true;
-    Preferences.heapProfilerPresent = true;
-    Preferences.detailedHeapProfiles = true;
-    Preferences.debuggerAlwaysEnabled = true;
-    Preferences.profilerAlwaysEnabled = true;
-    Preferences.nativeInstrumentationEnabled = true;
-    Preferences.fileSystemEnabled = false;
-    Preferences.showTimingTab = true;
-    Preferences.showCookiesTab = true;
     Preferences.saveAsAvailable = true;
     Preferences.useLowerCaseMenuTitlesOnWindows = true;
-    Preferences.canInspectWorkers = true;
-    Preferences.canClearCacheAndCookies = true;
-    Preferences.canDisableCache = true;
-    Preferences.showNetworkPanelInitiatorColumn = true;
-    Preferences.haveExtensions = true;
+    Preferences.hasExtensions = true;
     Preferences.sharedWorkersDebugNote = "Shared workers can be inspected in the Task Manager";
     Preferences.localizeUI = false;
     Preferences.applicationTitle = "Developer Tools - %s";
+
+    Capabilities.samplingCPUProfiler = true;
+    Capabilities.heapProfilerPresent = true;
+    Capabilities.detailedHeapProfiles = true;
+    Capabilities.debuggerAlwaysEnabled = true;
+    Capabilities.profilerAlwaysEnabled = true;
+    Capabilities.nativeInstrumentationEnabled = true;
+    Capabilities.showTimingTab = true;
+    Capabilities.showCookiesTab = true;
+    Capabilities.canInspectWorkers = true;
+    Capabilities.canClearCacheAndCookies = true;
+    Capabilities.canDisableCache = true;
 })();}