Diff
Modified: trunk/Source/WebCore/ChangeLog (112991 => 112992)
--- trunk/Source/WebCore/ChangeLog 2012-04-03 07:21:10 UTC (rev 112991)
+++ trunk/Source/WebCore/ChangeLog 2012-04-03 07:31:23 UTC (rev 112992)
@@ -1,3 +1,71 @@
+2012-04-02 Pavel Feldman <[email protected]>
+
+ Web Inspector: "Pause on start" doesn't change checked state in workers panel
+ https://bugs.webkit.org/show_bug.cgi?id=82908
+
+ Reviewed by Yury Semikhatsky.
+
+ This change partially reverts logic that was introduced with r111551:
+ preventDefault was called beside each stopPropagation. As a result, default checkbox handler was not working.
+ Event.prototype.consume now receives preventDefault parameter that controls whether default action
+ should be prevented.
+
+ * inspector/front-end/AdvancedSearchController.js:
+ (WebInspector.SearchView.prototype._onKeyDown):
+ * inspector/front-end/CSSSelectorProfileView.js:
+ * inspector/front-end/ConsoleView.js:
+ (WebInspector.ConsoleView.prototype._enterKeyPressed):
+ (WebInspector.ConsoleGroup.prototype._titleClicked):
+ * inspector/front-end/DataGrid.js:
+ (WebInspector.DataGrid.prototype._keyDown):
+ * inspector/front-end/DatabaseQueryView.js:
+ (WebInspector.DatabaseQueryView.prototype._enterKeyPressed):
+ * inspector/front-end/DetailedHeapshotView.js:
+ (WebInspector.DetailedHeapshotView.prototype._mouseDownInContentsGrid):
+ (WebInspector.DetailedHeapshotView.prototype._retainersHeaderDragging):
+ * inspector/front-end/Dialog.js:
+ (WebInspector.Dialog.prototype._onKeyDown):
+ * inspector/front-end/Drawer.js:
+ (WebInspector.Drawer.prototype._statusBarDragging):
+ * inspector/front-end/Object.js:
+ (WebInspector.Event.prototype.consume):
+ * inspector/front-end/ObjectPropertiesSection.js:
+ (WebInspector.ObjectPropertyTreeElement.prototype._promptKeyDown):
+ * inspector/front-end/ProfileView.js:
+ * inspector/front-end/SearchController.js:
+ (WebInspector.SearchController.prototype._onKeyDown):
+ * inspector/front-end/SoftContextMenu.js:
+ (.WebInspector.SoftContextMenu.prototype.show):
+ (.WebInspector.SoftContextMenu.prototype._menuItemMouseDown):
+ (.WebInspector.SoftContextMenu.prototype._menuKeyDown):
+ (.WebInspector.SoftContextMenu.prototype._discardMenu):
+ * inspector/front-end/Spectrum.js:
+ (WebInspector.Spectrum.draggable.consume):
+ (WebInspector.Spectrum.prototype._onKeyDown):
+ * inspector/front-end/StylesSidebarPane.js:
+ (WebInspector.StylesSidebarPane.muteEventListener):
+ (WebInspector.StylesSidebarPane):
+ (WebInspector.StylePropertiesSection.prototype._handleSelectorClick):
+ (WebInspector.StylePropertyTreeElement.prototype.updateTitle.):
+ (WebInspector.StylePropertyTreeElement.prototype):
+ * inspector/front-end/TextPrompt.js:
+ (WebInspector.TextPrompt.prototype.onKeyDown):
+ (WebInspector.TextPromptWithHistory.prototype.defaultKeyHandler):
+ (WebInspector.TextPrompt.SuggestBox.prototype._onItemMouseDown):
+ * inspector/front-end/TextViewer.js:
+ (WebInspector.TextViewer.prototype._handleKeyDown):
+ * inspector/front-end/UIUtils.js:
+ (WebInspector.startEditing):
+ * inspector/front-end/inspector.js:
+ (WebInspector.documentKeyDown):
+ * inspector/front-end/treeoutline.js:
+ (TreeOutline.prototype._treeKeyPress):
+ (TreeOutline.prototype._treeKeyDown):
+ (TreeOutline.prototype._searchInputKeyDown):
+ (TreeElement.prototype.selectOnMouseDown):
+ * inspector/front-end/utilities.js:
+ (Event.prototype.consume):
+
2012-04-02 Chris Fleizach <[email protected]>
AX: search field on Google.com does not have the AXSearchField subrole
Modified: trunk/Source/WebCore/inspector/front-end/AdvancedSearchController.js (112991 => 112992)
--- trunk/Source/WebCore/inspector/front-end/AdvancedSearchController.js 2012-04-03 07:21:10 UTC (rev 112991)
+++ trunk/Source/WebCore/inspector/front-end/AdvancedSearchController.js 2012-04-03 07:31:23 UTC (rev 112992)
@@ -376,7 +376,7 @@
break;
case WebInspector.KeyboardShortcut.Keys.Esc.code:
this._controller.close();
- event.consume();
+ event.consume(true);
break;
}
},
Modified: trunk/Source/WebCore/inspector/front-end/CSSSelectorProfileView.js (112991 => 112992)
--- trunk/Source/WebCore/inspector/front-end/CSSSelectorProfileView.js 2012-04-03 07:21:10 UTC (rev 112991)
+++ trunk/Source/WebCore/inspector/front-end/CSSSelectorProfileView.js 2012-04-03 07:31:23 UTC (rev 112992)
@@ -257,7 +257,7 @@
this.refreshShowAsPercents();
- event.consume();
+ event.consume(true);
}
}
Modified: trunk/Source/WebCore/inspector/front-end/ConsoleView.js (112991 => 112992)
--- trunk/Source/WebCore/inspector/front-end/ConsoleView.js 2012-04-03 07:21:10 UTC (rev 112991)
+++ trunk/Source/WebCore/inspector/front-end/ConsoleView.js 2012-04-03 07:31:23 UTC (rev 112992)
@@ -628,7 +628,7 @@
if (event.altKey || event.ctrlKey || event.shiftKey)
return;
- event.consume();
+ event.consume(true);
this.prompt.clearAutoComplete(true);
@@ -846,7 +846,7 @@
groupTitleElement.scrollIntoViewIfNeeded(true);
}
- event.consume();
+ event.consume(true);
}
}
Modified: trunk/Source/WebCore/inspector/front-end/DataGrid.js (112991 => 112992)
--- trunk/Source/WebCore/inspector/front-end/DataGrid.js 2012-04-03 07:21:10 UTC (rev 112991)
+++ trunk/Source/WebCore/inspector/front-end/DataGrid.js 2012-04-03 07:31:23 UTC (rev 112992)
@@ -895,7 +895,7 @@
}
if (handled)
- event.consume();
+ event.consume(true);
},
expand: function()
Modified: trunk/Source/WebCore/inspector/front-end/DatabaseQueryView.js (112991 => 112992)
--- trunk/Source/WebCore/inspector/front-end/DatabaseQueryView.js 2012-04-03 07:21:10 UTC (rev 112991)
+++ trunk/Source/WebCore/inspector/front-end/DatabaseQueryView.js 2012-04-03 07:31:23 UTC (rev 112992)
@@ -119,7 +119,7 @@
_enterKeyPressed: function(event)
{
- event.consume();
+ event.consume(true);
this.prompt.clearAutoComplete(true);
Modified: trunk/Source/WebCore/inspector/front-end/DetailedHeapshotView.js (112991 => 112992)
--- trunk/Source/WebCore/inspector/front-end/DetailedHeapshotView.js 2012-04-03 07:21:10 UTC (rev 112991)
+++ trunk/Source/WebCore/inspector/front-end/DetailedHeapshotView.js 2012-04-03 07:31:23 UTC (rev 112992)
@@ -877,7 +877,7 @@
if (!cell || (!cell.hasStyleClass("count-column") && !cell.hasStyleClass("shallowSize-column") && !cell.hasStyleClass("retainedSize-column")))
return;
- event.consume();
+ event.consume(true);
},
_mouseClickInRetainmentGrid: function(event)
@@ -1059,7 +1059,7 @@
height += this._previousDragPosition - event.pageY;
this._previousDragPosition = event.pageY;
this._updateRetainmentViewHeight(height);
- event.consume();
+ event.consume(true);
},
_endRetainersHeaderDragging: function(event)
Modified: trunk/Source/WebCore/inspector/front-end/Dialog.js (112991 => 112992)
--- trunk/Source/WebCore/inspector/front-end/Dialog.js 2012-04-03 07:21:10 UTC (rev 112991)
+++ trunk/Source/WebCore/inspector/front-end/Dialog.js 2012-04-03 07:31:23 UTC (rev 112992)
@@ -132,7 +132,7 @@
if (this._closeKeys.indexOf(event.keyCode) >= 0) {
this._hide();
- event.consume();
+ event.consume(true);
}
}
};
Modified: trunk/Source/WebCore/inspector/front-end/Drawer.js (112991 => 112992)
--- trunk/Source/WebCore/inspector/front-end/Drawer.js 2012-04-03 07:21:10 UTC (rev 112991)
+++ trunk/Source/WebCore/inspector/front-end/Drawer.js 2012-04-03 07:31:23 UTC (rev 112992)
@@ -265,7 +265,7 @@
WebInspector.inspectorView.currentPanel().doResize();
this._view.doResize();
- event.consume();
+ event.consume(true);
},
_endStatusBarDragging: function(event)
Modified: trunk/Source/WebCore/inspector/front-end/Object.js (112991 => 112992)
--- trunk/Source/WebCore/inspector/front-end/Object.js 2012-04-03 07:21:10 UTC (rev 112991)
+++ trunk/Source/WebCore/inspector/front-end/Object.js 2012-04-03 07:31:23 UTC (rev 112992)
@@ -133,10 +133,14 @@
this.defaultPrevented = true;
},
- consume: function()
+ /**
+ * @param {boolean=} preventDefault
+ */
+ consume: function(preventDefault)
{
this.stopPropagation();
- this.preventDefault();
+ if (preventDefault)
+ this.preventDefault();
}
}
Modified: trunk/Source/WebCore/inspector/front-end/ObjectPropertiesSection.js (112991 => 112992)
--- trunk/Source/WebCore/inspector/front-end/ObjectPropertiesSection.js 2012-04-03 07:21:10 UTC (rev 112991)
+++ trunk/Source/WebCore/inspector/front-end/ObjectPropertiesSection.js 2012-04-03 07:31:23 UTC (rev 112992)
@@ -386,7 +386,7 @@
_promptKeyDown: function(context, event)
{
if (isEnterKey(event)) {
- event.consume();
+ event.consume(true);
return this.editingCommitted(null, context.elementToEdit.textContent, context.previousContent, context);
}
if (event.keyIdentifier === "U+001B") { // Esc
Modified: trunk/Source/WebCore/inspector/front-end/ProfileView.js (112991 => 112992)
--- trunk/Source/WebCore/inspector/front-end/ProfileView.js 2012-04-03 07:21:10 UTC (rev 112991)
+++ trunk/Source/WebCore/inspector/front-end/ProfileView.js 2012-04-03 07:31:23 UTC (rev 112992)
@@ -540,7 +540,7 @@
this.refreshShowAsPercents();
- event.consume();
+ event.consume(true);
},
_assignParentsInProfile: function()
Modified: trunk/Source/WebCore/inspector/front-end/SearchController.js (112991 => 112992)
--- trunk/Source/WebCore/inspector/front-end/SearchController.js 2012-04-03 07:21:10 UTC (rev 112991)
+++ trunk/Source/WebCore/inspector/front-end/SearchController.js 2012-04-03 07:31:23 UTC (rev 112992)
@@ -203,7 +203,7 @@
if (event.target.value === "")
return;
- event.consume();
+ event.consume(true);
this.cancelSearch();
WebInspector.setCurrentFocusElement(WebInspector.previousFocusElement());
Modified: trunk/Source/WebCore/inspector/front-end/SoftContextMenu.js (112991 => 112992)
--- trunk/Source/WebCore/inspector/front-end/SoftContextMenu.js 2012-04-03 07:21:10 UTC (rev 112991)
+++ trunk/Source/WebCore/inspector/front-end/SoftContextMenu.js 2012-04-03 07:31:23 UTC (rev 112992)
@@ -81,7 +81,7 @@
if (document.body.offsetHeight < this._contextMenuElement.offsetTop + this._contextMenuElement.offsetHeight)
this._contextMenuElement.style.top = (document.body.offsetHeight - this._contextMenuElement.offsetHeight) + "px";
- event.consume();
+ event.consume(true);
},
_createMenuItem: function(item)
@@ -123,7 +123,7 @@
_menuItemMouseDown: function(event)
{
// Do not let separator's mouse down hit menu's handler - we need to receive mouse up!
- event.consume();
+ event.consume(true);
},
_menuItemMouseUp: function(event)
@@ -195,7 +195,7 @@
this._triggerAction(this._highlightedMenuItemElement, event);
break;
}
- event.consume();
+ event.consume(true);
},
_glassPaneMouseUp: function(event)
@@ -214,7 +214,7 @@
// This can re-enter discardMenu due to blur.
document.body.removeChild(glassPane);
- event.consume();
+ event.consume(true);
}
}
}
Modified: trunk/Source/WebCore/inspector/front-end/Spectrum.js (112991 => 112992)
--- trunk/Source/WebCore/inspector/front-end/Spectrum.js 2012-04-03 07:21:10 UTC (rev 112991)
+++ trunk/Source/WebCore/inspector/front-end/Spectrum.js 2012-04-03 07:31:23 UTC (rev 112992)
@@ -188,7 +188,7 @@
function consume(e)
{
- e.consume();
+ e.consume(true);
}
function move(e)
@@ -428,7 +428,7 @@
{
if (event.keyIdentifier === "Enter" || event.keyIdentifier === "U+001B") { // Escape key
this.hide();
- event.consume();
+ event.consume(true);
}
}
}
Modified: trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js (112991 => 112992)
--- trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js 2012-04-03 07:21:10 UTC (rev 112991)
+++ trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js 2012-04-03 07:31:23 UTC (rev 112992)
@@ -59,7 +59,7 @@
this.settingsSelectElement.appendChild(option);
// Prevent section from collapsing.
- var muteEventListener = function(event) { event.consume(); };
+ var muteEventListener = function(event) { event.consume(true); };
this.settingsSelectElement.addEventListener("click", muteEventListener, true);
this.settingsSelectElement.addEventListener("change", this._changeSetting.bind(this), false);
@@ -1257,7 +1257,7 @@
_handleSelectorClick: function(event)
{
this._startEditingOnMouseEvent();
- event.consume();
+ event.consume(true);
},
_startEditingOnMouseEvent: function()
@@ -1805,7 +1805,7 @@
scrollerElement.addEventListener("scroll", repositionSpectrum, false);
}
}
- e.consume();
+ e.consume(true);
}
function getFormat()
@@ -2025,7 +2025,7 @@
_mouseClick: function(event)
{
- event.consume();
+ event.consume(true);
if (event.target === this.listItemElement) {
if (!this.section.editable)
Modified: trunk/Source/WebCore/inspector/front-end/TextPrompt.js (112991 => 112992)
--- trunk/Source/WebCore/inspector/front-end/TextPrompt.js 2012-04-03 07:21:10 UTC (rev 112991)
+++ trunk/Source/WebCore/inspector/front-end/TextPrompt.js 2012-04-03 07:31:23 UTC (rev 112992)
@@ -278,7 +278,7 @@
handled = this.defaultKeyHandler(event);
if (handled)
- event.consume();
+ event.consume(true);
return handled;
},
@@ -880,7 +880,7 @@
}
if (newText !== undefined) {
- event.consume();
+ event.consume(true);
this.text = newText;
if (isPrevious) {
@@ -1133,7 +1133,7 @@
_onItemMouseDown: function(text, event)
{
this.acceptSuggestion(text);
- event.consume();
+ event.consume(true);
},
_createItemElement: function(prefix, text)
Modified: trunk/Source/WebCore/inspector/front-end/TextViewer.js (112991 => 112992)
--- trunk/Source/WebCore/inspector/front-end/TextViewer.js 2012-04-03 07:21:10 UTC (rev 112991)
+++ trunk/Source/WebCore/inspector/front-end/TextViewer.js 2012-04-03 07:31:23 UTC (rev 112992)
@@ -277,7 +277,7 @@
var shortcutKey = WebInspector.KeyboardShortcut.makeKeyFromEvent(e);
var handler = this._shortcuts[shortcutKey];
if (handler && handler())
- e.consume();
+ e.consume(true);
},
_contextMenu: function(event)
Modified: trunk/Source/WebCore/inspector/front-end/UIUtils.js (112991 => 112992)
--- trunk/Source/WebCore/inspector/front-end/UIUtils.js 2012-04-03 07:21:10 UTC (rev 112991)
+++ trunk/Source/WebCore/inspector/front-end/UIUtils.js 2012-04-03 07:31:23 UTC (rev 112992)
@@ -355,10 +355,10 @@
{
if (result === "commit") {
editingCommitted.call(element);
- event.consume();
+ event.consume(true);
} else if (result === "cancel") {
editingCancelled.call(element);
- event.consume();
+ event.consume(true);
} else if (result && result.indexOf("move-") === 0) {
moveDirection = result.substring(5);
if (event.keyIdentifier !== "U+0009")
Modified: trunk/Source/WebCore/inspector/front-end/inspector.js (112991 => 112992)
--- trunk/Source/WebCore/inspector/front-end/inspector.js 2012-04-03 07:21:10 UTC (rev 112991)
+++ trunk/Source/WebCore/inspector/front-end/inspector.js 2012-04-03 07:31:23 UTC (rev 112992)
@@ -590,7 +590,7 @@
return;
// Prevent the link from navigating, since we don't do any navigation by following links normally.
- event.consume();
+ event.consume(true);
function followLink()
{
@@ -687,14 +687,14 @@
if (event.keyIdentifier === "F1" ||
(event.keyIdentifier === helpKey && event.shiftKey && (!WebInspector.isBeingEdited(event.target) || event.metaKey))) {
WebInspector.shortcutsScreen.show();
- event.consume();
+ event.consume(true);
return;
}
if (WebInspector.currentFocusElement() && WebInspector.currentFocusElement().handleKeyEvent) {
WebInspector.currentFocusElement().handleKeyEvent(event);
if (event.handled) {
- event.consume();
+ event.consume(true);
return;
}
}
@@ -702,7 +702,7 @@
if (WebInspector.inspectorView.currentPanel()) {
WebInspector.inspectorView.currentPanel().handleShortcut(event);
if (event.handled) {
- event.consume();
+ event.consume(true);
return;
}
}
@@ -710,7 +710,7 @@
WebInspector.searchController.handleShortcut(event);
WebInspector.advancedSearchController.handleShortcut(event);
if (event.handled) {
- event.consume();
+ event.consume(true);
return;
}
@@ -719,13 +719,13 @@
case "U+0052": // R key
if ((event.metaKey && isMac) || (event.ctrlKey && !isMac)) {
PageAgent.reload(event.shiftKey);
- event.consume();
+ event.consume(true);
}
break;
case "F5":
if (!isMac) {
PageAgent.reload(event.ctrlKey || event.shiftKey);
- event.consume();
+ event.consume(true);
}
break;
}
@@ -739,20 +739,20 @@
case 187: // +
if (isValidZoomShortcut) {
WebInspector._zoomIn();
- event.consume();
+ event.consume(true);
}
break;
case 109: // -
case 189: // -
if (isValidZoomShortcut) {
WebInspector._zoomOut();
- event.consume();
+ event.consume(true);
}
break;
case 48: // 0
if (isValidZoomShortcut) {
WebInspector._resetZoom();
- event.consume();
+ event.consume(true);
}
break;
}
Modified: trunk/Source/WebCore/inspector/front-end/treeoutline.js (112991 => 112992)
--- trunk/Source/WebCore/inspector/front-end/treeoutline.js 2012-04-03 07:21:10 UTC (rev 112991)
+++ trunk/Source/WebCore/inspector/front-end/treeoutline.js 2012-04-03 07:31:23 UTC (rev 112992)
@@ -345,7 +345,7 @@
return;
this._startSearch(searchText);
- event.consume();
+ event.consume(true);
}
TreeOutline.prototype._treeKeyDown = function(event)
@@ -420,7 +420,7 @@
}
if (handled)
- event.consume();
+ event.consume(true);
}
TreeOutline.prototype.expand = function()
@@ -541,7 +541,7 @@
this._showSearchMatchElement(nextSelectedElement);
if (handled)
- event.consume();
+ event.consume(true);
else
window.setTimeout(this._boundSearchTextChanged, 0);
}
@@ -1009,7 +1009,7 @@
TreeElement.prototype.selectOnMouseDown = function(event)
{
if (this.select(false, true))
- event.consume();
+ event.consume(true);
}
/**
Modified: trunk/Source/WebCore/inspector/front-end/utilities.js (112991 => 112992)
--- trunk/Source/WebCore/inspector/front-end/utilities.js 2012-04-03 07:21:10 UTC (rev 112991)
+++ trunk/Source/WebCore/inspector/front-end/utilities.js 2012-04-03 07:31:23 UTC (rev 112992)
@@ -376,10 +376,14 @@
}
});
-Event.prototype.consume = function()
+/**
+ * @param {boolean=} preventDefault
+ */
+Event.prototype.consume = function(preventDefault)
{
this.stopImmediatePropagation();
- this.preventDefault();
+ if (preventDefault)
+ this.preventDefault();
this.handled = true;
}
