Handle the "key" field as opposed to keyIdentifier field.

third_party/WebKit/Source/core/input/KeyboardEventManager.cpp

 // Copyright 2016 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 "KeyboardEventManager.h"
 
 #include "core/dom/Element.h"
 #include "core/editing/Editor.h"
 #include "core/events/KeyboardEvent.h"
 #include "core/html/HTMLDialogElement.h"
 #include "core/input/EventHandler.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/LayoutTextControlSingleLine.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/FocusController.h"
 #include "core/page/Page.h"
 #include "core/page/SpatialNavigation.h"
 #include "platform/PlatformKeyboardEvent.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/WindowsKeyboardCodes.h"
 
 namespace blink {
 
 namespace {
 
-WebFocusType focusDirectionForKey(const AtomicString& keyIdentifier)
+WebFocusType focusDirectionForKey(const String& key)
 {
-    DEFINE_STATIC_LOCAL(AtomicString, Down, ("Down"));
-    DEFINE_STATIC_LOCAL(AtomicString, Up, ("Up"));
-    DEFINE_STATIC_LOCAL(AtomicString, Left, ("Left"));
-    DEFINE_STATIC_LOCAL(AtomicString, Right, ("Right"));
-
     WebFocusType retVal = WebFocusTypeNone;
-
-    if (keyIdentifier == Down)
+    if (key == "ArrowDown")
         retVal = WebFocusTypeDown;
-    else if (keyIdentifier == Up)
+    else if (key == "ArrowUp")
         retVal = WebFocusTypeUp;
-    else if (keyIdentifier == Left)
+    else if (key == "ArrowLeft")
         retVal = WebFocusTypeLeft;
-    else if (keyIdentifier == Right)
+    else if (key == "ArrowRight")
         retVal = WebFocusTypeRight;
-
     return retVal;
 }
 
 } // namespace
 
 KeyboardEventManager::KeyboardEventManager(
     LocalFrame* frame, ScrollManager* scrollManager)
 : m_frame(frame)
 , m_scrollManager(scrollManager)
 {
@@ skipping 112 matching lines @@
 {
     if (event->type() == EventTypeNames::keydown) {
         // Clear caret blinking suspended state to make sure that caret blinks
         // when we type again after long pressing on an empty input field.
         if (m_frame && m_frame->selection().isCaretBlinkingSuspended())
             m_frame->selection().setCaretBlinkingSuspended(false);
 
         m_frame->editor().handleKeyboardEvent(event);
         if (event->defaultHandled())
             return;
-        if (event->keyIdentifier() == "U+0009") {
+        if (event->key() == "Tab") {
             defaultTabEventHandler(event);
-        } else if (event->keyIdentifier() == "U+0008") {
+        } else if (event->key() == "Backspace") {
             defaultBackspaceEventHandler(event);
-        } else if (event->keyIdentifier() == "U+001B") {
+        } else if (event->key() == "Escape") {
             defaultEscapeEventHandler(event);
         } else {
-            WebFocusType type = focusDirectionForKey(AtomicString(event->keyIdentifier()));
+            WebFocusType type = focusDirectionForKey(event->key());
             if (type != WebFocusTypeNone)
                 defaultArrowEventHandler(type, event);
         }
     }
     if (event->type() == EventTypeNames::keypress) {
         m_frame->editor().handleKeyboardEvent(event);
         if (event->defaultHandled())
             return;
         if (event->charCode() == ' ')
             defaultSpaceEventHandler(event, possibleFocusedNode);
@@ skipping 96 matching lines @@
     if (HTMLDialogElement* dialog = m_frame->document()->activeModalDialog())
         dialog->dispatchEvent(Event::createCancelable(EventTypeNames::cancel));
 }
 
 DEFINE_TRACE(KeyboardEventManager)
 {
     visitor->trace(m_frame);
 }
 
 } // namespace blink