am 3b242d08: am 91a3bec8: Show "Go" for the last textfield in a form.

Merge commit '3b242d089e9d96995ad22fb2ed76fa1a9533eb64'

* commit '3b242d089e9d96995ad22fb2ed76fa1a9533eb64':
  Show "Go" for the last textfield in a form.

1 files changed, 7 insertions, 3 deletions

diff --git a/WebKit/android/nav/CachedRoot.cpp b/WebKit/android/nav/CachedRoot.cpp
index 0011f06..2354ebc 100644
--- a/WebKit/android/nav/CachedRoot.cpp
+++ b/WebKit/android/nav/CachedRoot.cpp
@@ -771,9 +771,13 @@ CachedRoot::ImeAction CachedRoot::cursorTextFieldAction() const
         return FAILURE;
     }
     // Now find the next textfield/area starting with the cursor
-    if (cursorFrame->nextTextField(cursor, 0, true)) {
-        // There is a textfield/area after the cursor, so the textfield under
-        // the cursor should have the NEXT action
+    const CachedFrame* potentialFrame;
+    const CachedNode* potentialNext
+            = cursorFrame->nextTextField(cursor, &potentialFrame, true);
+    if (potentialNext && cursorFrame->textInput(cursor)->formPointer()
+            == potentialFrame->textInput(potentialNext)->formPointer()) {
+        // There is a textfield/area after the cursor in the same form,
+        // so the textfield under the cursor should have the NEXT action
         return NEXT;
     }
     // If this line is reached, we know that the textfield under the cursor is