Merge 112539 - Web Inspector: "go to the previous panel" shortcut is painful to maintain

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

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 70 matching lines @@
                 WebInspector.settings.lastActivePanel.set(panelName);
                 this._pushToHistory(panelName);
                 WebInspector.userMetrics.panelShown(panelName);
             }
         }
     },
 
     _keyDown: function(event)
     {
         switch (event.keyIdentifier) {
-            case "Left":
-                var isBackKey = !event.shiftKey && WebInspector.KeyboardShortcut.eventHasCtrlOrMeta(event) && !WebInspector.isBeingEdited(event.target);
-                if (isBackKey && this._canGoBackInHistory()) {
-                    this._goBackInHistory();
-                    event.preventDefault();
-                }
-                break;
-
-            case "Right":
-                var isForwardKey = !event.shiftKey && WebInspector.KeyboardShortcut.eventHasCtrlOrMeta(event) && !WebInspector.isBeingEdited(event.target);
-                if (isForwardKey && this._canGoForwardInHistory()) {
-                    this._goForwardInHistory();
-                    event.preventDefault();
-                }
-                break;
-
             // Windows and Mac have two different definitions of [, so accept both.
             case "U+005B":
             case "U+00DB": // [ key
                 var isRotateLeft = WebInspector.KeyboardShortcut.eventHasCtrlOrMeta(event) && !event.shiftKey && !event.altKey;
                 if (isRotateLeft) {
                     var index = this._panelOrder.indexOf(this.currentPanel());
                     index = (index === 0) ? this._panelOrder.length - 1 : index - 1;
                     this._panelOrder[index].toolbarItem.click();
-                    event.preventDefault();
+                    event.consume();
+                    return;
+                }
+
+                var isGoBack = WebInspector.KeyboardShortcut.eventHasCtrlOrMeta(event) && event.altKey;
+                if (isGoBack && this._canGoBackInHistory()) {
+                    this._goBackInHistory();
+                    event.consume();
                 }
                 break;
 
             // Windows and Mac have two different definitions of ], so accept both.
             case "U+005D":
             case "U+00DD":  // ] key
                 var isRotateRight = WebInspector.KeyboardShortcut.eventHasCtrlOrMeta(event) && !event.shiftKey && !event.altKey;
                 if (isRotateRight) {
                     var index = this._panelOrder.indexOf(this.currentPanel());
                     index = (index + 1) % this._panelOrder.length;
                     this._panelOrder[index].toolbarItem.click();
-                    event.preventDefault();
+                    event.consume();
+                    return;
                 }
-    
+
+                var isGoForward = WebInspector.KeyboardShortcut.eventHasCtrlOrMeta(event) && event.altKey;
+                if (isGoForward && this._canGoForwardInHistory()) {
+                    this._goForwardInHistory();
+                    event.consume();
+                }
                 break;
         }
     },
 
     _canGoBackInHistory: function()
     {
         return this._historyIterator > 0;
     },
 
     _goBackInHistory: function()
@@ skipping 26 matching lines @@
         this._historyIterator = this._history.length - 1;
     }
 }
 
 WebInspector.InspectorView.prototype.__proto__ = WebInspector.View.prototype;
 
 /**
  * @type {WebInspector.InspectorView}
  */
 WebInspector.inspectorView = null;