Merge webkit.org at r54127 : Initial merge by git

Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82

1 files changed, 2 insertions, 3 deletions

diff --git a/WebCore/inspector/front-end/DatabaseQueryView.js b/WebCore/inspector/front-end/DatabaseQueryView.js
index e85af66..2656842 100644
--- a/WebCore/inspector/front-end/DatabaseQueryView.js
+++ b/WebCore/inspector/front-end/DatabaseQueryView.js
@@ -31,6 +31,7 @@ WebInspector.DatabaseQueryView = function(database)
 
     this.element.addStyleClass("storage-view");
     this.element.addStyleClass("query");
+    this.element.addStyleClass("monospace");
     this.element.tabIndex = 0;
 
     this.element.addEventListener("selectstart", this._selectStart.bind(this), false);
@@ -38,7 +39,7 @@ WebInspector.DatabaseQueryView = function(database)
     this.promptElement = document.createElement("div");
     this.promptElement.className = "database-query-prompt";
     this.promptElement.appendChild(document.createElement("br"));
-    this.promptElement.handleKeyEvent = this._promptKeyDown.bind(this);
+    this.promptElement.addEventListener("keydown", this._promptKeyDown.bind(this), true);
     this.element.appendChild(this.promptElement);
 
     this.prompt = new WebInspector.TextPrompt(this.promptElement, this.completions.bind(this), " ");
@@ -98,8 +99,6 @@ WebInspector.DatabaseQueryView.prototype = {
             this._enterKeyPressed(event);
             return;
         }
-
-        this.prompt.handleKeyEvent(event);
     },
 
     _selectStart: function(event)