Stop clamping tabIndex to short range

third_party/WebKit/Source/core/page/FocusController.cpp

 /*
  * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nuanti Ltd.
  *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 408 matching lines @@
     Element* current = scope.currentElement();
     if (shouldVisit(*current) && adjustedTabIndex(*current) == tabIndex)
       return current;
   }
   return nullptr;
 }
 
 Element* nextElementWithGreaterTabIndex(ScopedFocusNavigation& scope,
                                         int tabIndex) {
   // Search is inclusive of start
-  int winningTabIndex = std::numeric_limits<short>::max() + 1;
+  int winningTabIndex = std::numeric_limits<int>::max();
   Element* winner = nullptr;
   for (; scope.currentElement(); scope.moveToNext()) {
     Element* current = scope.currentElement();
     int currentTabIndex = adjustedTabIndex(*current);
-    if (shouldVisit(*current) && currentTabIndex > tabIndex &&
-        currentTabIndex < winningTabIndex) {
-      winner = current;
-      winningTabIndex = currentTabIndex;
+    if (shouldVisit(*current) && currentTabIndex > tabIndex) {
+      if (!winner || currentTabIndex < winningTabIndex) {
+        winner = current;
+        winningTabIndex = currentTabIndex;
+      }
     }
   }
   return winner;
 }
 
 Element* previousElementWithLowerTabIndex(ScopedFocusNavigation& scope,
                                           int tabIndex) {
   // Search is inclusive of start
   int winningTabIndex = 0;
   Element* winner = nullptr;
@@ skipping 78 matching lines @@
     if (Element* winner =
             findElementWithExactTabIndex(scope, tabIndex, WebFocusTypeBackward))
       return winner;
   }
 
   // There are no elements before start with the same tabindex as start, so look
   // for an element that:
   // 1) has the highest non-zero tabindex (that is less than start's tabindex),
   //    and
   // 2) comes last in the scope, if there's a tie.
-  tabIndex =
-      (current && tabIndex) ? tabIndex : std::numeric_limits<short>::max();
+  tabIndex = (current && tabIndex) ? tabIndex : std::numeric_limits<int>::max();
   scope.moveToLast();
   return previousElementWithLowerTabIndex(scope, tabIndex);
 }
 
 // Searches through the given tree scope, starting from start element, for the
 // next/previous selectable element that comes after/before start element.
 // The order followed is as specified in the HTML spec[1], which is elements
 // with tab indexes first (from lowest to highest), and then elements without
 // tab indexes (in document order).  The search algorithm also conforms the
 // Shadow DOM spec[2], which inserts sequence in a shadow tree into its host.
@@ skipping 863 matching lines @@
 
   return consumed;
 }
 
 DEFINE_TRACE(FocusController) {
   visitor->trace(m_page);
   visitor->trace(m_focusedFrame);
 }
 
 }  // namespace blink