DO NOT SUBMIT: Fix input action type for Android

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 43 matching lines @@
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/PageScaleConstraintsSet.h"
 #include "core/frame/RemoteFrame.h"
 #include "core/frame/Settings.h"
 #include "core/frame/SmartClip.h"
 #include "core/frame/TopControls.h"
 #include "core/frame/UseCounter.h"
 #include "core/frame/VisualViewport.h"
+#include "core/html/HTMLFormElement.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/HTMLPlugInElement.h"
 #include "core/html/HTMLTextAreaElement.h"
 #include "core/input/EventHandler.h"
 #include "core/input/TouchActionUtil.h"
 #include "core/layout/LayoutPart.h"
 #include "core/layout/TextAutosizer.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/layout/compositing/PaintLayerCompositor.h"
@@ skipping 2340 matching lines @@
     Element* editable = focused->selection().rootEditableElementOrDocumentElement();
     DCHECK(editable);
 
     // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
     // needs to be audited.  See http://crbug.com/590369 for more details.
     editable->document().updateStyleAndLayoutIgnorePendingStylesheets();
 
     return PlainTextRange::create(*editable, range);
 }
 
+int textInputActionFlags(int type, FocusController& focusController) {
+    if (type == WebTextInputTypeSearch) {
+        return WebTextInputFlagActionSearch;
+    }
+    HTMLElement* current = toHTMLElement(focusController.getCurrentElementForFocusNavigation(WebFocusTypeForward));
+    if (!current)
+        return 0;
+
+    HTMLFormElement* currentForm = FormAssociatedElement::findAssociatedForm(current);
+
+    bool hasNextFocusableInFormOrDocument = false;
+    // TODO(changwan): optimize this.
+    Element* nextFocusableElement = focusController.findNextFocusableElementInDocumentOrder();
+    if (nextFocusableElement) {
+        HTMLElement* nextFocusableHtmlElement = toHTMLElement(nextFocusableElement);
+        if (nextFocusableHtmlElement) {
+            HTMLFormElement* nextFocusableElementForm = FormAssociatedElement::findAssociatedForm(nextFocusableHtmlElement);
+            // Both currentForm and nextFocusableElementForm may be nullptr.
+            hasNextFocusableInFormOrDocument = currentForm == nextFocusableElementForm;
+        }
+    }
+
+    int flags = 0;
+    if (hasNextFocusableInFormOrDocument) {
+        flags |= WebTextInputFlagActionNext;
+    } else if (currentForm) {
+        flags |= WebTextInputFlagActionGo;
+    } else {
+        flags |= WebTextInputFlagActionNone;
+    }
+    return flags;
+}
+
 // TODO(ekaramad):This method is almost duplicated in WebFrameWidgetImpl as
 // well. This code needs to be refactored  (http://crbug.com/629721).
 WebTextInputInfo WebViewImpl::textInputInfo()
 {
     WebTextInputInfo info;
 
     LocalFrame* focused = focusedLocalFrameInWidget();
     if (!focused)
         return info;
 
@@ skipping 15 matching lines @@
 
     if (!focused->editor().canEdit())
         return info;
 
     // TODO(dglazkov): The use of updateStyleAndLayoutIgnorePendingStylesheets needs to be audited.
     // see http://crbug.com/590369 for more details.
     focused->document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
     DocumentLifecycle::DisallowTransitionScope disallowTransition(focused->document()->lifecycle());
 
+    info.flags |= textInputActionFlags(info.type, page()->focusController());
+
     // Emits an object replacement character for each replaced element so that
     // it is exposed to IME and thus could be deleted by IME on android.
     info.value = plainText(EphemeralRange::rangeOfContents(*element), TextIteratorEmitsObjectReplacementCharacter);
 
     if (info.value.isEmpty())
         return info;
 
     EphemeralRange firstRange = firstEphemeralRangeOf(selection.selection());
     if (firstRange.isNotNull()) {
         PlainTextRange plainTextRange(PlainTextRange::create(*element, firstRange));
@@ skipping 2123 matching lines @@
         return nullptr;
     return focusedFrame;
 }
 
 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const
 {
     return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
 }
 
 } // namespace blink