Diff
Modified: trunk/Source/WebCore/ChangeLog (145547 => 145548)
--- trunk/Source/WebCore/ChangeLog 2013-03-12 15:17:58 UTC (rev 145547)
+++ trunk/Source/WebCore/ChangeLog 2013-03-12 15:19:37 UTC (rev 145548)
@@ -1,3 +1,19 @@
+2013-03-12 Eugene Klyuchnikov <eus...@chromium.org>
+
+ Web Inspector: [REGRESSION] StepInto (F11) and StepOut (Shift-F11) shortcuts toggle Inspector window full-screen state
+ https://bugs.webkit.org/show_bug.cgi?id=112113
+
+ Reviewed by Alexander Pavlov.
+
+ Updated handlers missed in first patch. Added JSDocs to all handlers.
+
+ * inspector/front-end/Panel.js: Fixed JSDocs.
+ * inspector/front-end/CallStackSidebarPane.js:
+ Added return values. Added JSDocs.
+ * inspector/front-end/ScriptsPanel.js: Ditto.
+ * inspector/front-end/GoToLineDialog.js: Added JSDocs.
+ * inspector/front-end/TimelinePanel.js: Ditto.
+
2013-03-12 Alberto Garcia <agar...@igalia.com>
[BlackBerry] DisplayRefreshMonitor: rename m_timestamp back to m_monotonicAnimationStartTime
Modified: trunk/Source/WebCore/inspector/front-end/CallStackSidebarPane.js (145547 => 145548)
--- trunk/Source/WebCore/inspector/front-end/CallStackSidebarPane.js 2013-03-12 15:17:58 UTC (rev 145547)
+++ trunk/Source/WebCore/inspector/front-end/CallStackSidebarPane.js 2013-03-12 15:19:37 UTC (rev 145548)
@@ -68,22 +68,35 @@
}
},
- _selectNextCallFrameOnStack: function()
+ /**
+ * @param {Event=} event
+ * @return {boolean}
+ */
+ _selectNextCallFrameOnStack: function(event)
{
var index = this._selectedCallFrameIndex();
if (index == -1)
- return;
+ return true;
this._selectedPlacardByIndex(index + 1);
+ return true;
},
- _selectPreviousCallFrameOnStack: function()
+ /**
+ * @param {Event=} event
+ * @return {boolean}
+ */
+ _selectPreviousCallFrameOnStack: function(event)
{
var index = this._selectedCallFrameIndex();
if (index == -1)
- return;
+ return true;
this._selectedPlacardByIndex(index - 1);
+ return true;
},
+ /**
+ * @param {number} index
+ */
_selectedPlacardByIndex: function(index)
{
if (index < 0 || index >= this.placards.length)
@@ -91,6 +104,9 @@
this._placardSelected(this.placards[index])
},
+ /**
+ * @return {number}
+ */
_selectedCallFrameIndex: function()
{
if (!this._model.selectedCallFrame())
@@ -117,7 +133,7 @@
},
/**
- * @param {function(!Array.<!WebInspector.KeyboardShortcut.Descriptor>, function(KeyboardEvent))} registerShortcutDelegate
+ * @param {function(!Array.<!WebInspector.KeyboardShortcut.Descriptor>, function(Event=):boolean)} registerShortcutDelegate
*/
registerShortcuts: function(registerShortcutDelegate)
{
Modified: trunk/Source/WebCore/inspector/front-end/GoToLineDialog.js (145547 => 145548)
--- trunk/Source/WebCore/inspector/front-end/GoToLineDialog.js 2013-03-12 15:17:58 UTC (rev 145547)
+++ trunk/Source/WebCore/inspector/front-end/GoToLineDialog.js 2013-03-12 15:19:37 UTC (rev 145548)
@@ -64,9 +64,10 @@
/**
* @param {function():?WebInspector.View} viewGetter
+ * @param {Event=} event
* @return {boolean}
*/
-WebInspector.GoToLineDialog._show = function(viewGetter)
+WebInspector.GoToLineDialog._show = function(viewGetter, event)
{
var sourceView = viewGetter();
if (!sourceView || !sourceView.canHighlightLine())
Modified: trunk/Source/WebCore/inspector/front-end/Panel.js (145547 => 145548)
--- trunk/Source/WebCore/inspector/front-end/Panel.js 2013-03-12 15:17:58 UTC (rev 145547)
+++ trunk/Source/WebCore/inspector/front-end/Panel.js 2013-03-12 15:19:37 UTC (rev 145548)
@@ -39,7 +39,7 @@
this.element.addStyleClass(name);
this._panelName = name;
- this._shortcuts = {};
+ this._shortcuts = /** !Object.<number, function(Event=):boolean> */ ({});
WebInspector.settings[this._sidebarWidthSettingName()] = WebInspector.settings.createSetting(this._sidebarWidthSettingName(), undefined);
}
@@ -257,7 +257,7 @@
/**
* @param {!Array.<!WebInspector.KeyboardShortcut.Descriptor>} keys
- * @param {function(KeyboardEvent):boolean} handler
+ * @param {function(Event=):boolean} handler
*/
registerShortcuts: function(keys, handler)
{
Modified: trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js (145547 => 145548)
--- trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2013-03-12 15:17:58 UTC (rev 145547)
+++ trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2013-03-12 15:19:37 UTC (rev 145548)
@@ -674,7 +674,11 @@
WebInspector.settings.pauseOnExceptionStateString.set(nextStateMap[this._pauseOnExceptionButton.state]);
},
- _togglePause: function()
+ /**
+ * @param {Event=} event
+ * @return {boolean}
+ */
+ _togglePause: function(event)
{
if (this._paused) {
this._paused = false;
@@ -687,12 +691,17 @@
}
this._clearInterface();
+ return true;
},
- _stepOverClicked: function()
+ /**
+ * @param {Event=} event
+ * @return {boolean}
+ */
+ _stepOverClicked: function(event)
{
if (!this._paused)
- return;
+ return true;
this._paused = false;
this._stepping = true;
@@ -700,12 +709,17 @@
this._clearInterface();
DebuggerAgent.stepOver();
+ return true;
},
- _stepIntoClicked: function()
+ /**
+ * @param {Event=} event
+ * @return {boolean}
+ */
+ _stepIntoClicked: function(event)
{
if (!this._paused)
- return;
+ return true;
this._paused = false;
this._stepping = true;
@@ -713,12 +727,17 @@
this._clearInterface();
DebuggerAgent.stepInto();
+ return true;
},
- _stepOutClicked: function()
+ /**
+ * @param {Event=} event
+ * @return {boolean}
+ */
+ _stepOutClicked: function(event)
{
if (!this._paused)
- return;
+ return true;
this._paused = false;
this._stepping = true;
@@ -726,6 +745,7 @@
this._clearInterface();
DebuggerAgent.stepOut();
+ return true;
},
_toggleBreakpointsClicked: function(event)
@@ -748,7 +768,11 @@
}
},
- _evaluateSelectionInConsole: function()
+ /**
+ * @param {Event=} event
+ * @return {boolean}
+ */
+ _evaluateSelectionInConsole: function(event)
{
var selection = window.getSelection();
if (selection.type !== "Range" || selection.isCollapsed)
@@ -814,7 +838,7 @@
/**
* @param {string} buttonId
* @param {string} buttonTitle
- * @param {function(Event)} handler
+ * @param {function(Event=):boolean} handler
* @param {!Array.<!WebInspector.KeyboardShortcut.Descriptor>} shortcuts
*/
_createButtonAndRegisterShortcuts: function(buttonId, buttonTitle, handler, shortcuts)
@@ -955,6 +979,9 @@
this.sidebarPanes.watchExpressions.addExpression(_expression_);
},
+ /**
+ * @return {boolean}
+ */
_toggleBreakpoint: function()
{
var sourceFrame = this.visibleView;
@@ -969,7 +996,11 @@
return false;
},
- _showOutlineDialog: function()
+ /**
+ * @param {Event=} event
+ * @return {boolean}
+ */
+ _showOutlineDialog: function(event)
{
var uiSourceCode = this._editorContainer.currentFile();
if (!uiSourceCode)
Modified: trunk/Source/WebCore/inspector/front-end/TimelinePanel.js (145547 => 145548)
--- trunk/Source/WebCore/inspector/front-end/TimelinePanel.js 2013-03-12 15:17:58 UTC (rev 145547)
+++ trunk/Source/WebCore/inspector/front-end/TimelinePanel.js 2013-03-12 15:19:37 UTC (rev 145548)
@@ -344,7 +344,7 @@
this.registerShortcuts(WebInspector.TimelinePanelDescriptor.ShortcutKeys.StartStopRecording, this._toggleTimelineButtonClicked.bind(this));
if (InspectorFrontendHost.canSave())
this.registerShortcuts(WebInspector.TimelinePanelDescriptor.ShortcutKeys.SaveToFile, this._saveToFile.bind(this));
- this.registerShortcuts(WebInspector.TimelinePanelDescriptor.ShortcutKeys.LoadFromFile, this._fileSelectorElement.click.bind(this._fileSelectorElement));
+ this.registerShortcuts(WebInspector.TimelinePanelDescriptor.ShortcutKeys.LoadFromFile, this._selectFileToLoad.bind(this));
},
_createFileSelector: function()
@@ -361,19 +361,32 @@
var contextMenu = new WebInspector.ContextMenu(event);
if (InspectorFrontendHost.canSave())
contextMenu.appendItem(WebInspector.UIString("Save Timeline data\u2026"), this._saveToFile.bind(this), this._operationInProgress);
- contextMenu.appendItem(WebInspector.UIString("Load Timeline data\u2026"), this._fileSelectorElement.click.bind(this._fileSelectorElement), this._operationInProgress);
+ contextMenu.appendItem(WebInspector.UIString("Load Timeline data\u2026"), this._selectFileToLoad.bind(this), this._operationInProgress);
contextMenu.show();
},
- _saveToFile: function()
+ /**
+ * @param {Event=} event
+ * @return {boolean}
+ */
+ _saveToFile: function(event)
{
if (this._operationInProgress)
- return false;
+ return true;
this._model.saveToFile();
return true;
},
/**
+ * @param {Event=} event
+ * @return {boolean}
+ */
+ _selectFileToLoad: function(event) {
+ this._fileSelectorElement.click();
+ return true;
+ },
+
+ /**
* @param {!File} file
*/
_loadFromFile: function(file)
@@ -560,10 +573,13 @@
}
},
+ /**
+ * @return {boolean}
+ */
_toggleTimelineButtonClicked: function()
{
if (this._operationInProgress)
- return false;
+ return true;
if (this.toggleTimelineButton.toggled) {
this._model.stopRecord();
this.toggleTimelineButton.title = WebInspector.UIString("Record");
