DO NOT SUBMIT: Fix input action type for Android

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 423 matching lines @@
             winningTabIndex = currentTabIndex;
         }
     }
     return winner;
 }
 
 Element* nextFocusableElement(ScopedFocusNavigation& scope)
 {
     Element* current = scope.currentElement();
     if (current) {
+      LOG(ERROR) << "XXX nextFocusable: " << current->outerHTML();
         int tabIndex = adjustedTabIndex(*current);
         // If an element is excluded from the normal tabbing cycle, the next focusable element is determined by tree order
+      LOG(ERROR) << "XXX nextFocusable: " << tabIndex;
         if (tabIndex < 0) {
             for (scope.moveToNext(); scope.currentElement(); scope.moveToNext()) {
                 current = scope.currentElement();
                 if (shouldVisit(*current) && adjustedTabIndex(*current) >= 0)
                     return current;
             }
         } else {
             // First try to find an element with the same tabindex as start that comes after start in the scope.
             scope.moveToNext();
             if (Element* winner = findElementWithExactTabIndex(scope, tabIndex, WebFocusTypeForward))
@@ skipping 70 matching lines @@
 {
     Element* found = (type == WebFocusTypeForward) ? nextFocusableElement(scope) : previousFocusableElement(scope);
     return found;
 }
 
 Element* findFocusableElementRecursivelyForward(ScopedFocusNavigation& scope)
 {
     // Starting element is exclusive.
     Element* found = findFocusableElementInternal(WebFocusTypeForward, scope);
     while (found) {
+      LOG(ERROR) << "XXX findFocusable: " << found->outerHTML();
         if (isShadowHostDelegatesFocus(*found)) {
             // If tabindex is positive, find focusable element inside its shadow tree.
             if (found->tabIndex() >= 0 && isShadowHostWithoutCustomFocusLogic(*found)) {
                 ScopedFocusNavigation innerScope = ScopedFocusNavigation::ownedByShadowHost(*found);
                 if (Element* foundInInnerFocusScope = findFocusableElementRecursivelyForward(innerScope))
                     return foundInInnerFocusScope;
             }
             // Skip to the next element in the same scope.
             found = findFocusableElementInternal(WebFocusTypeForward, scope);
             continue;
@@ skipping 310 matching lines @@
     // of handleFocusedUIElementChanged, because this will send the notification even if the element is the same.
     if (focusedOrMainFrame()->isLocalFrame()) {
         Document* document = toLocalFrame(focusedOrMainFrame())->document();
         if (AXObjectCache* cache = document->existingAXObjectCache())
             cache->handleInitialFocus();
     }
 
     return didAdvanceFocus;
 }
 
+Element* FocusController::getCurrentElementForFocusNavigation(WebFocusType type) {
+    LocalFrame* frame = toLocalFrame(focusedOrMainFrame());
+    Document* document = frame->document();
+    document->updateStyleAndLayoutIgnorePendingStylesheets();
+
+    Element* current = document->sequentialFocusNavigationStartingPoint(type);
+
+    // FIXME: Not quite correct when it comes to focus transitions leaving/entering the WebView itself
+    bool caretBrowsing = frame->settings() && frame->settings()->caretBrowsingEnabled();
+
+    if (caretBrowsing && !current)
+        current = adjustToElement(frame->selection().start().anchorNode(), type);
+    return current;
+}
+
+Element* FocusController::findNextFocusableElementInDocumentOrder() {
+    LocalFrame* frame = toLocalFrame(focusedOrMainFrame());
+    Document* document = frame->document();
+    document->updateStyleAndLayoutIgnorePendingStylesheets();
+    WebFocusType type = WebFocusTypeForward;
+    Element* current = getCurrentElementForFocusNavigation(type);
+    ScopedFocusNavigation scope = current ? ScopedFocusNavigation::createFor(*current) : ScopedFocusNavigation::createForDocument(*document);
+    return findFocusableElementAcrossFocusScopes(type, scope);
+}
+
 bool FocusController::advanceFocus(WebFocusType type, bool initialFocus, InputDeviceCapabilities* sourceCapabilities)
 {
     switch (type) {
     case WebFocusTypeForward:
     case WebFocusTypeBackward: {
         // We should never hit this when a RemoteFrame is focused, since the key
         // event that initiated focus advancement should've been routed to that
         // frame's process from the beginning.
         LocalFrame* startingFrame = toLocalFrame(focusedOrMainFrame());
         return advanceFocusInDocumentOrder(startingFrame, nullptr, type, initialFocus, sourceCapabilities);
@@ skipping 438 matching lines @@
     return consumed;
 }
 
 DEFINE_TRACE(FocusController)
 {
     visitor->trace(m_page);
     visitor->trace(m_focusedFrame);
 }
 
 } // namespace blink