From f6e0183053d69f3671916a578956363bf569c24c Mon Sep 17 00:00:00 2001 From: "pfeldman@chromium.org" Date: Fri, 30 Dec 2011 06:01:06 +0000 Subject: [PATCH] Web Inspector: enable dock-to-right view (still need embedders to support it). https://bugs.webkit.org/show_bug.cgi?id=75360 Patch by Pavel Feldman on 2011-12-29 Reviewed by Yury Semikhatsky. Source/WebCore: * English.lproj/localizedStrings.js: * inspector/front-end/Settings.js: (WebInspector.Settings): * inspector/front-end/SettingsScreen.js: (WebInspector.SettingsScreen): * inspector/front-end/inspector.js: (WebInspector.set attached): (WebInspector._renderAsAttached.get return): (WebInspector._renderAsAttached): (WebInspector._installDockToRight.updateToolbar): Source/WebKit/chromium: * src/js/DevTools.js: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@103835 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 18 +++++++++ Source/WebCore/English.lproj/localizedStrings.js | Bin 75922 -> 76110 bytes Source/WebCore/inspector/front-end/Settings.js | 4 +- .../WebCore/inspector/front-end/SettingsScreen.js | 5 +++ Source/WebCore/inspector/front-end/inspector.js | 43 +++++++++++++++++---- Source/WebKit/chromium/ChangeLog | 9 +++++ Source/WebKit/chromium/src/js/DevTools.js | 1 + 7 files changed, 72 insertions(+), 8 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index cdd0070..d4d047e 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,21 @@ +2011-12-29 Pavel Feldman + + Web Inspector: enable dock-to-right view (still need embedders to support it). + https://bugs.webkit.org/show_bug.cgi?id=75360 + + Reviewed by Yury Semikhatsky. + + * English.lproj/localizedStrings.js: + * inspector/front-end/Settings.js: + (WebInspector.Settings): + * inspector/front-end/SettingsScreen.js: + (WebInspector.SettingsScreen): + * inspector/front-end/inspector.js: + (WebInspector.set attached): + (WebInspector._renderAsAttached.get return): + (WebInspector._renderAsAttached): + (WebInspector._installDockToRight.updateToolbar): + 2011-12-29 Raymond Liu Use IDL overloads in AudioContext.idl for createBuffer diff --git a/Source/WebCore/English.lproj/localizedStrings.js b/Source/WebCore/English.lproj/localizedStrings.js index 01aeed9c05b7b0b087ffc9ce4f35b68bdd85a320..2f8cb79bd299d191f419fdd2369f27b1c32843a4 100644 GIT binary patch delta 76 zcmbPqk>%VamWC~ilQbqzs8!)~XGmqp1LC5|g|WiyFm_|E{^So{0-Qw*nGER+84M+p R#l2+(;5-H;25SZ`1^~Yp6*&L^ delta 11 ScmX?iiDlA7mWC~ilQaM#I|Tax diff --git a/Source/WebCore/inspector/front-end/Settings.js b/Source/WebCore/inspector/front-end/Settings.js index d01c491..9be95f8 100644 --- a/Source/WebCore/inspector/front-end/Settings.js +++ b/Source/WebCore/inspector/front-end/Settings.js @@ -43,7 +43,8 @@ var Preferences = { exposeDisableCache: false, exposeWorkersInspection: false, applicationTitle: "Web Inspector - %s", - showHeapSnapshotObjectsHiddenProperties: false + showHeapSnapshotObjectsHiddenProperties: false, + showDockToRight: false } var Capabilities = { @@ -86,6 +87,7 @@ WebInspector.Settings = function() this.overrideUserAgent = this.createSetting("overrideUserAgent", ""); this.userAgent = this.createSetting("userAgent", ""); this.showScriptFolders = this.createSetting("showScriptFolders", true); + this.dockToRight = this.createSetting("dockToRight", false); // If there are too many breakpoints in a storage, it is likely due to a recent bug that caused // periodical breakpoints duplication leading to inspector slowness. diff --git a/Source/WebCore/inspector/front-end/SettingsScreen.js b/Source/WebCore/inspector/front-end/SettingsScreen.js index 8629501..a2e07b4 100644 --- a/Source/WebCore/inspector/front-end/SettingsScreen.js +++ b/Source/WebCore/inspector/front-end/SettingsScreen.js @@ -39,6 +39,11 @@ WebInspector.SettingsScreen = function() this._leftColumnElement = document.createElement("td"); this._rightColumnElement = document.createElement("td"); + if (Preferences.showDockToRight) { + var p = this._appendSection(WebInspector.UIString("General")); + p.appendChild(this._createCheckboxSetting(WebInspector.UIString("Dock to right"), WebInspector.settings.dockToRight)); + } + var p = this._appendSection(WebInspector.UIString("Elements")); p.appendChild(this._createCheckboxSetting(WebInspector.UIString("Word wrap"), WebInspector.settings.domWordWrap)); diff --git a/Source/WebCore/inspector/front-end/inspector.js b/Source/WebCore/inspector/front-end/inspector.js index 53d22dc..aee34d6 100644 --- a/Source/WebCore/inspector/front-end/inspector.js +++ b/Source/WebCore/inspector/front-end/inspector.js @@ -182,8 +182,17 @@ var WebInspector = { this._attached = x; - var body = document.body; + if (this._dockToggleButton) { + this._dockToggleButton.title = this._dockButtonTitle(); + this._dockToggleButton.toggled = !x; + } + + this._renderAsAttached(x && !WebInspector.settings.dockToRight.get()); + }, + _renderAsAttached: function(x) + { + var body = document.body; if (x) { body.removeStyleClass("detached"); body.addStyleClass("attached"); @@ -192,11 +201,6 @@ var WebInspector = { body.addStyleClass("detached"); } - if (this._dockToggleButton) { - this._dockToggleButton.title = this._dockButtonTitle(); - this._dockToggleButton.toggled = !x; - } - // This may be called before doLoadedDone, hence the bulk of inspector objects may // not be created yet. if (WebInspector.toolbar) @@ -414,16 +418,41 @@ WebInspector._doLoadedDoneWithCapabilities = function() WebInspector.showPanel(WebInspector.settings.lastActivePanel.get()); } + WebInspector._installDockToRight(); + InspectorAgent.enable(showInitialPanel); DatabaseAgent.enable(); DOMStorageAgent.enable(); - WebInspector.CSSCompletions.requestCSSNameCompletions(); WebInspector.WorkerManager.loadCompleted(); InspectorFrontendAPI.loadCompleted(); } +WebInspector._installDockToRight = function() +{ + // Re-use Settings infrastructure for the dock-to-right settings UI + WebInspector.settings.dockToRight.set(WebInspector.queryParamsObject.dockSide === "right"); + WebInspector.settings.dockToRight.addChangeListener(listener.bind(this)); + updateToolbar(); + + function updateToolbar() + { + if (WebInspector.attached) + WebInspector._renderAsAttached(!WebInspector.settings.dockToRight.get()); + } + + function listener(event) + { + var value = WebInspector.settings.dockToRight.get(); + if (value) + InspectorFrontendHost.requestSetDockSide("right"); + else + InspectorFrontendHost.requestSetDockSide("bottom"); + updateToolbar(); + } +} + WebInspector.addPanel = function(panel) { WebInspector.inspectorView.addPanel(panel); diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog index cbd25b7..859a96d 100644 --- a/Source/WebKit/chromium/ChangeLog +++ b/Source/WebKit/chromium/ChangeLog @@ -1,3 +1,12 @@ +2011-12-29 Pavel Feldman + + Web Inspector: enable dock-to-right view (still need embedders to support it). + https://bugs.webkit.org/show_bug.cgi?id=75360 + + Reviewed by Yury Semikhatsky. + + * src/js/DevTools.js: + 2011-12-29 Dmitry Lomov https://bugs.webkit.org/show_bug.cgi?id=75373 diff --git a/Source/WebKit/chromium/src/js/DevTools.js b/Source/WebKit/chromium/src/js/DevTools.js index 99bc8c8..499b604 100644 --- a/Source/WebKit/chromium/src/js/DevTools.js +++ b/Source/WebKit/chromium/src/js/DevTools.js @@ -40,6 +40,7 @@ Preferences.applicationTitle = "Developer Tools - %s"; Preferences.exposeDisableCache = true; Preferences.exposeWorkersInspection = true; + Preferences.showDockToRight = true; })();} function buildPlatformExtensionAPI(extensionInfo) -- 2.7.4