Remove EF_FUNCTION_KEY and EF_NUMPAD_KEY.

ui/events/keycodes/dom4/keycode_converter.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/events/keycodes/dom4/keycode_converter.h"
 
 #include "base/logging.h"
 #include "ui/events/keycodes/dom3/dom_code.h"
 #include "ui/events/keycodes/dom3/dom_key.h"
 
@@ skipping 121 matching lines @@
   LOG(WARNING) << "unrecognized code string '" << code << "'";
   return DomCode::NONE;
 }
 
 // static
 const char* KeycodeConverter::DomCodeToCodeString(DomCode dom_code) {
   return UsbKeycodeToCode(static_cast<uint32_t>(dom_code));
 }
 
 // static
+DomCodeLocation KeycodeConverter::DomCodeToLocation(DomCode dom_code) {
+  static const struct {
+    DomCode code;
+    DomCodeLocation location;
+  } kLocations[] = {{DomCode::CONTROL_LEFT, DomCodeLocation::LEFT},

[Wez, 2015/05/05 00:29:09]

Will this cause a static to be initialized on first-use, or just a pre-populated
text area with no initializer, since the content looks like POD?

[kpschoedel, 2015/05/05 16:30:08]

'static const' lets it use the data directly from read-only text.

+                    {DomCode::SHIFT_LEFT, DomCodeLocation::LEFT},
+                    {DomCode::ALT_LEFT, DomCodeLocation::LEFT},
+                    {DomCode::OS_LEFT, DomCodeLocation::LEFT},
+                    {DomCode::CONTROL_RIGHT, DomCodeLocation::RIGHT},
+                    {DomCode::SHIFT_RIGHT, DomCodeLocation::RIGHT},
+                    {DomCode::ALT_RIGHT, DomCodeLocation::RIGHT},
+                    {DomCode::OS_RIGHT, DomCodeLocation::RIGHT},
+                    {DomCode::NUMPAD_DIVIDE, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD_MULTIPLY, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD_SUBTRACT, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD_ADD, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD_ENTER, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD1, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD2, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD3, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD4, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD5, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD6, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD7, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD8, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD9, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD0, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD_DECIMAL, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD_EQUAL, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD_COMMA, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD_PAREN_LEFT, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD_PAREN_RIGHT, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD_BACKSPACE, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD_MEMORY_STORE, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD_MEMORY_RECALL, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD_MEMORY_CLEAR, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD_MEMORY_ADD, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD_MEMORY_SUBTRACT, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD_SIGN_CHANGE, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD_CLEAR, DomCodeLocation::NUMPAD},
+                    {DomCode::NUMPAD_CLEAR_ENTRY, DomCodeLocation::NUMPAD}};

[Wez, 2015/05/05 00:29:09]

nit: Although this is future-proof, you could reasonably restructure this as a
set of range-checks w/ some compile-time checks to protect against the enum
values getting messed-with, e.g. if (CONTROL_RIGHT <= code <= OS_RIGHT) return
::RIGHT...

[kpschoedel, 2015/05/05 16:30:08]

Yes; my reasoning was that the non-digit NUMPAD values are numerically
scattered, and they need to all be tested before we can return
DomCodeLocation::STANDARD. The most efficient code would probably come from
writing it as a switch and letting the compiler sort out the best way to express
the map.

[Wez, 2015/05/05 21:23:44]

Acknowledged.

+  for (const auto& key : kLocations) {
+    if (key.code == dom_code)
+      return key.location;
+  }
+  return DomCodeLocation::STANDARD;
+}
+
+// static
 DomKey KeycodeConverter::KeyStringToDomKey(const char* key) {
   if (!key || !*key)
     return DomKey::NONE;
   for (size_t i = 0; i < kDomKeyMapEntries; ++i) {
     if (dom_key_map[i].string &&
         strcmp(dom_key_map[i].string, key) == 0) {
       return dom_key_map[i].dom_key;
     }
   }
   return DomKey::NONE;
@@ skipping 72 matching lines @@
   for (size_t i = 0; i < kKeycodeMapEntries; ++i) {
     if (usb_keycode_map[i].code &&
         strcmp(usb_keycode_map[i].code, code) == 0) {
       return usb_keycode_map[i].usb_keycode;
     }
   }
   return InvalidUsbKeycode();
 }
 
 }  // namespace ui