DevTools: Decouple shortcuts from actions, introduce shortcut contexts

Source/devtools/front_end/KeyboardShortcut.js

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2009 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 264 matching lines @@
 
     return res;
 };
 
 /**
  * @param {!KeyboardEvent} event
  */
 WebInspector.KeyboardShortcut.handleShortcut = function(event)
 {
     var key = WebInspector.KeyboardShortcut.makeKeyFromEvent(event);
-    var extensions = WebInspector.KeyboardShortcut._keysToActionExtensions[key];
+    var extensions = WebInspector.KeyboardShortcut._keyToAction[key];
     if (!extensions)
         return;
 
+    extensions = WebInspector.context.applicableExtensions(extensions).items();

[pfeldman, 2014/04/17 10:40:25]

Lets cache them?

[apavlov, 2014/04/17 12:42:22]

Since the context is dynamic, we should always select only applicable extensions
(for the current shortcut, so these are already cached) by their declared
contextTypes.

+    for (var i = 0; i < extensions.length; ++i) {
+        var extension = extensions[i];
+        var ident = event.keyIdentifier;
+        if (/^F\d+|Control|Shift|Alt|Meta|Win|U\+001B$/.test(ident) || event.ctrlKey || event.altKey || event.metaKey) {
+            if (handler(extension))
+                return;
+        } else {
+            WebInspector.KeyboardShortcut._pendingActionTimer = setTimeout(handler.bind(null, extension), 0);
+            break;
+        }
+    }
+
+    /**
+     * @param {!WebInspector.ModuleManager.Extension} extension
+     * @return {boolean}
+     */
     function handler(extension)
     {
-        var result = extension.instance().handleAction(event);
+        var result = WebInspector.actionRegistry.execute(extension.descriptor()["actionId"], event);
         if (result)
             event.consume(true);
         delete WebInspector.KeyboardShortcut._pendingActionTimer;
         return result;
     }
-
-    for (var i = 0; i < extensions.length; ++i) {
-        var ident = event.keyIdentifier;
-        if (/^F\d+|Control|Shift|Alt|Meta|Win|U\+001B$/.test(ident) || event.ctrlKey || event.altKey || event.metaKey) {
-            if (handler(extensions[i]))
-                return;
-        } else {
-            WebInspector.KeyboardShortcut._pendingActionTimer = setTimeout(handler.bind(null, extensions[i]), 0);
-            break;
-        }
-    }
 }
 
 WebInspector.KeyboardShortcut.SelectAll = WebInspector.KeyboardShortcut.makeKey("a", WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta);
 
 WebInspector.KeyboardShortcut._onKeyPress = function(event)
 {
     if (!WebInspector.KeyboardShortcut._pendingActionTimer)
         return;
 
     var target = event.target;
     if (WebInspector.isBeingEdited(event.target)) {
         clearTimeout(WebInspector.KeyboardShortcut._pendingActionTimer);
         delete WebInspector.KeyboardShortcut._pendingActionTimer;
     }
 }
 
-WebInspector.KeyboardShortcut.registerActions = function()
+WebInspector.KeyboardShortcut.registerBindings = function()
 {
     document.addEventListener("keypress", WebInspector.KeyboardShortcut._onKeyPress, true);
-    WebInspector.KeyboardShortcut._keysToActionExtensions = {};
+    WebInspector.KeyboardShortcut._keyToAction = {};
     var extensions = WebInspector.moduleManager.extensions(WebInspector.ActionDelegate);
-    extensions.forEach(registerBindings);
+    extensions.forEach(registerExtension);
 
     /**
      * @param {!WebInspector.ModuleManager.Extension} extension
      */
-    function registerBindings(extension)
+    function registerExtension(extension)
     {
-        var bindings = extension.descriptor().bindings;
+        var bindings = extension.descriptor()["bindings"];
         for (var i = 0; bindings && i < bindings.length; ++i) {
             if (!platformMatches(bindings[i].platform))
                 continue;
             var shortcuts = bindings[i].shortcut.split(/\s+/);
             shortcuts.forEach(registerShortcut.bind(null, extension));
         }
     }
 
     /**
      * @param {!WebInspector.ModuleManager.Extension} extension
-     * @param {string} shortcut
      */
     function registerShortcut(extension, shortcut)
     {
         var key = WebInspector.KeyboardShortcut.makeKeyFromBindingShortcut(shortcut);
         if (!key)
             return;
-        if (WebInspector.KeyboardShortcut._keysToActionExtensions[key])
-            WebInspector.KeyboardShortcut._keysToActionExtensions[key].push(extension);
+        if (WebInspector.KeyboardShortcut._keyToAction[key])
+            WebInspector.KeyboardShortcut._keyToAction[key].push(extension);
         else
-            WebInspector.KeyboardShortcut._keysToActionExtensions[key] = [extension];
+            WebInspector.KeyboardShortcut._keyToAction[key] = [extension];
     }
 
     /**
      * @param {string=} platformsString
      * @return {boolean}
      */
     function platformMatches(platformsString)
     {
         if (!platformsString)
             return true;
         var platforms = platformsString.split(",");
         var isMatch = false;
         var currentPlatform = WebInspector.platform();
         for (var i = 0; !isMatch && i < platforms.length; ++i)
             isMatch = platforms[i] === currentPlatform;
         return isMatch;
     }
 }