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

third_party/WebKit/Source/core/html/HTMLSelectElement.cpp

 /*
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
@@ skipping 1268 matching lines @@
     // valueChanged, which gets called after the user makes a selection from the
     // menu.
     saveLastSelection();
     showPopup();
     event->setDefaultHandled();
     return;
 }
 
 bool HTMLSelectElement::shouldOpenPopupForKeyDownEvent(KeyboardEvent* keyEvent)
 {
-    const String& keyIdentifier = keyEvent->keyIdentifier();
+    const String& key = keyEvent->key();
     LayoutTheme& layoutTheme = LayoutTheme::theme();
 
     if (isSpatialNavigationEnabled(document().frame()))
         return false;
 
-    return ((layoutTheme.popsMenuByArrowKeys() &&  (keyIdentifier == "Down" || keyIdentifier == "Up"))
-        || (layoutTheme.popsMenuByAltDownUpOrF4Key() && (keyIdentifier == "Down" || keyIdentifier == "Up") && keyEvent->altKey())
-        || (layoutTheme.popsMenuByAltDownUpOrF4Key() && (!keyEvent->altKey() && !keyEvent->ctrlKey() && keyIdentifier == "F4")));
+    return ((layoutTheme.popsMenuByArrowKeys() && (key == "ArrowDown" || key == "ArrowUp"))
+        || (layoutTheme.popsMenuByAltDownUpOrF4Key() && (key == "ArrowDown" || key == "ArrowUp") && keyEvent->altKey())
+        || (layoutTheme.popsMenuByAltDownUpOrF4Key() && (!keyEvent->altKey() && !keyEvent->ctrlKey() && key == "F4")));
 }
 
 bool HTMLSelectElement::shouldOpenPopupForKeyPressEvent(KeyboardEvent *event)
 {
     LayoutTheme& layoutTheme = LayoutTheme::theme();
     int keyCode = event->keyCode();
 
     return ((layoutTheme.popsMenuBySpaceKey() && event->keyCode() == ' ' && !m_typeAhead.hasActiveSession(event))
         || (layoutTheme.popsMenuByReturnKey() && keyCode == '\r'));
 }
@@ skipping 16 matching lines @@
         if (isSpatialNavigationEnabled(document().frame())) {
             if (!m_activeSelectionState)
                 return;
         }
 
         // The key handling below shouldn't be used for non spatial navigation
         // mode Mac
         if (LayoutTheme::theme().popsMenuByArrowKeys() && !isSpatialNavigationEnabled(document().frame()))
             return;
 
-        const String& keyIdentifier = keyEvent->keyIdentifier();
+        const String& key = keyEvent->key();
         bool handled = true;
         const ListItems& listItems = this->listItems();
         HTMLOptionElement* option = selectedOption();
         int listIndex = option ? option->listIndex() : -1;
 
-        if (keyIdentifier == "Down" || keyIdentifier == "Right")
+        if (key == "ArrowDown" || key == "ArrowRight")
             option = nextValidOption(listIndex, SkipForwards, 1);
-        else if (keyIdentifier == "Up" || keyIdentifier == "Left")
+        else if (key == "ArrowUp" || key == "ArrowLeft")
             option = nextValidOption(listIndex, SkipBackwards, 1);
-        else if (keyIdentifier == "PageDown")
+        else if (key == "PageDown")
             option = nextValidOption(listIndex, SkipForwards, 3);
-        else if (keyIdentifier == "PageUp")
+        else if (key == "PageUp")
             option = nextValidOption(listIndex, SkipBackwards, 3);
-        else if (keyIdentifier == "Home")
+        else if (key == "Home")
             option = nextValidOption(-1, SkipForwards, 1);
-        else if (keyIdentifier == "End")
+        else if (key == "End")
             option = nextValidOption(listItems.size(), SkipBackwards, 1);
         else
             handled = false;
 
         if (handled && option)
             selectOption(option, DeselectOtherOptions | MakeOptionDirty | DispatchInputAndChangeEvent);
 
         if (handled)
             event->setDefaultHandled();
     }
@@ skipping 206 matching lines @@
 
     } else if (event->type() == EventTypeNames::mouseup && event->isMouseEvent() && toMouseEvent(event)->button() == LeftButton && layoutObject()) {
         if (document().page() && document().page()->autoscrollController().autoscrollInProgress(toLayoutBox(layoutObject())))
             document().page()->autoscrollController().stopAutoscroll();
         else
             handleMouseRelease();
 
     } else if (event->type() == EventTypeNames::keydown) {
         if (!event->isKeyboardEvent())
             return;
-        const String& keyIdentifier = toKeyboardEvent(event)->keyIdentifier();
+        const String& key = toKeyboardEvent(event)->key();
 
         bool handled = false;
         HTMLOptionElement* endOption = nullptr;
         if (!m_activeSelectionEnd) {
             // Initialize the end index
-            if (keyIdentifier == "Down" || keyIdentifier == "PageDown") {
+            if (key == "ArrowDown" || key == "PageDown") {
                 HTMLOptionElement* startOption = lastSelectedOption();
                 handled = true;
-                if (keyIdentifier == "Down")
+                if (key == "ArrowDown")
                     endOption = nextSelectableOption(startOption);
                 else
                     endOption = nextSelectableOptionPageAway(startOption, SkipForwards);
-            } else if (keyIdentifier == "Up" || keyIdentifier == "PageUp") {
+            } else if (key == "ArrowUp" || key == "PageUp") {
                 HTMLOptionElement* startOption = selectedOption();
                 handled = true;
-                if (keyIdentifier == "Up")
+                if (key == "ArrowUp")
                     endOption = previousSelectableOption(startOption);
                 else
                     endOption = nextSelectableOptionPageAway(startOption, SkipBackwards);
             }
         } else {
             // Set the end index based on the current end index.
-            if (keyIdentifier == "Down") {
+            if (key == "ArrowDown") {
                 endOption = nextSelectableOption(m_activeSelectionEnd.get());
                 handled = true;
-            } else if (keyIdentifier == "Up") {
+            } else if (key == "ArrowUp") {
                 endOption = previousSelectableOption(m_activeSelectionEnd.get());
                 handled = true;
-            } else if (keyIdentifier == "PageDown") {
+            } else if (key == "PageDown") {
                 endOption = nextSelectableOptionPageAway(m_activeSelectionEnd.get(), SkipForwards);
                 handled = true;
-            } else if (keyIdentifier == "PageUp") {
+            } else if (key == "PageUp") {
                 endOption = nextSelectableOptionPageAway(m_activeSelectionEnd.get(), SkipBackwards);
                 handled = true;
             }
         }
-        if (keyIdentifier == "Home") {
+        if (key == "Home") {
             endOption = firstSelectableOption();
             handled = true;
-        } else if (keyIdentifier == "End") {
+        } else if (key == "End") {
             endOption = lastSelectableOption();
             handled = true;
         }
 
         if (isSpatialNavigationEnabled(document().frame())) {
             // Check if the selection moves to the boundary.
-            if (keyIdentifier == "Left" || keyIdentifier == "Right" || ((keyIdentifier == "Down" || keyIdentifier == "Up") && endOption == m_activeSelectionEnd))
+            if (key == "ArrowLeft" || key == "ArrowRight" || ((key == "ArrowDown" || key == "ArrowUp") && endOption == m_activeSelectionEnd))
                 return;
         }
 
         if (endOption && handled) {
             // Save the selection so it can be compared to the new selection
             // when dispatching change events immediately after making the new
             // selection.
             saveLastSelection();
 
             setActiveSelectionEnd(endOption);
@@ skipping 438 matching lines @@
 }
 
 void HTMLSelectElement::didMutateSubtree()
 {
     DCHECK(popupIsVisible());
     DCHECK(m_popup);
     m_popup->updateFromElement(PopupMenu::ByDOMChange);
 }
 
 } // namespace blink