Adding support for Smart GO NEXT feature in Android Chrome

Source/web/tests/WebViewTest.cpp

Index: Source/web/tests/WebViewTest.cpp
diff --git a/Source/web/tests/WebViewTest.cpp b/Source/web/tests/WebViewTest.cpp
index 3c654c3750e2d071e855d8f66815e65620e0848d..dd8385871f46c16288883247a19856ba887e746c 100644
--- a/Source/web/tests/WebViewTest.cpp
+++ b/Source/web/tests/WebViewTest.cpp
@@ -3049,4 +3049,109 @@ TEST_F(WebViewTest, TestRecordFrameTimingEvents)
     }
 }
 
+TEST_F(WebViewTest, MoveFocusToNextFocusableElementInForm)
+{
+    const std::string testFile = "advance-focus-in-form.html";
+    URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8(testFile.c_str()));
+    WebView* webViewImpl = m_webViewHelper.initializeAndLoad(m_baseURL + testFile, true, 0);
+    webViewImpl->setInitialFocus(false);
+    WebLocalFrameImpl* frame = toWebLocalFrameImpl(webViewImpl->mainFrame());
+    HTMLDocument* document = toHTMLDocument(frame->frame()->document());
+    const int defaultTextInputFlags = WebTextInputFlagAutocapitalizeSentences;
+    Element* elementList[20] = { nullptr };

[kochi, 2015/07/02 11:04:36]

You shouldn't use an array in a loose manner like this, even in a unit test.

This doesn't have to be an array at all in the following tests
(e.g. no loops through the elements), no element 11-19 are used which is bad,
although the numbering makes some sense when you focus backwards
(like lines 3095-).

Probably it's better delete this line, and declare each element like

Element* el0 = document->getElementById("input1");
...
Element* el1 = document->getElementById("contenteditable1")
...

Or maybe, you can rename the variable identically with the element id

Element* input1 = document->getElementById("input1");
...
Element* contenteditable1 = document->getElementById("contenteditable1")
...

to make it easier to match between C++ test and the HTML.

[AKV, 2015/07/02 12:45:05]

Done. Thanks

+    elementList[0] = document->getElementById("input1");

[kochi, 2015/07/02 11:04:36]

It would be more readable if you split lines 3062-3093 for each element.

e.g.
<newline>
elementList[0] = ...
..
..
<newline>
elementList[1] = ...

[AKV, 2015/07/02 12:45:05]

Done.

+    document->setFocusedElement(elementList[0]);
+    WebTextInputInfo textInputInfo = webViewImpl->textInputInfo();
+    EXPECT_EQ(defaultTextInputFlags | WebTextInputFlagHaveNextFocusableElement, textInputInfo.flags);
+    webViewImpl->advanceFocusInForm(WebFocusTypeForward);
+    elementList[1] = document->getElementById("contenteditable1");
+    EXPECT_EQ(elementList[1], document->focusedElement());
+    textInputInfo = webViewImpl->textInputInfo();
+    EXPECT_EQ(WebTextInputFlagHaveNextFocusableElement | WebTextInputFlagHavePreviousFocusableElement, textInputInfo.flags);
+    webViewImpl->advanceFocusInForm(WebFocusTypeForward);
+    elementList[2] = document->getElementById("input2");
+    EXPECT_EQ(elementList[2], document->focusedElement());
+    textInputInfo = webViewImpl->textInputInfo();
+    EXPECT_EQ(defaultTextInputFlags | WebTextInputFlagHaveNextFocusableElement | WebTextInputFlagHavePreviousFocusableElement | WebTextInputFlagListeningToKeyboardEvents, textInputInfo.flags);
+    webViewImpl->advanceFocusInForm(WebFocusTypeForward);
+    elementList[3] = document->getElementById("textarea1");
+    EXPECT_EQ(elementList[3], document->focusedElement());
+    textInputInfo = webViewImpl->textInputInfo();
+    EXPECT_EQ(defaultTextInputFlags | WebTextInputFlagHaveNextFocusableElement | WebTextInputFlagHavePreviousFocusableElement, textInputInfo.flags);
+    webViewImpl->advanceFocusInForm(WebFocusTypeForward);
+    elementList[4] = document->getElementById("input3");
+    EXPECT_EQ(elementList[4], document->focusedElement());
+    textInputInfo = webViewImpl->textInputInfo();
+    EXPECT_EQ(defaultTextInputFlags | WebTextInputFlagHaveNextFocusableElement | WebTextInputFlagHavePreviousFocusableElement, textInputInfo.flags);
+    webViewImpl->advanceFocusInForm(WebFocusTypeForward);
+    elementList[5] = document->getElementById("textarea2");
+    EXPECT_EQ(elementList[5], document->focusedElement());
+    textInputInfo = webViewImpl->textInputInfo();
+    EXPECT_EQ(defaultTextInputFlags | WebTextInputFlagHavePreviousFocusableElement, textInputInfo.flags);
+    webViewImpl->advanceFocusInForm(WebFocusTypeForward);
+    // No next element, hence focus will stay on same element.
+    EXPECT_EQ(elementList[5], document->focusedElement());
+
+    webViewImpl->advanceFocusInForm(WebFocusTypeBackward);
+    EXPECT_EQ(elementList[4], document->focusedElement());
+    webViewImpl->advanceFocusInForm(WebFocusTypeBackward);
+    EXPECT_EQ(elementList[3], document->focusedElement());
+    webViewImpl->advanceFocusInForm(WebFocusTypeBackward);
+    EXPECT_EQ(elementList[2], document->focusedElement());
+    webViewImpl->advanceFocusInForm(WebFocusTypeBackward);
+    EXPECT_EQ(elementList[1], document->focusedElement());
+    webViewImpl->advanceFocusInForm(WebFocusTypeBackward);
+    EXPECT_EQ(elementList[0], document->focusedElement());
+    webViewImpl->advanceFocusInForm(WebFocusTypeBackward);
+    // No previous element, hence focus will stay on same element.
+    EXPECT_EQ(elementList[0], document->focusedElement());
+
+    elementList[6] = document->getElementById("contenteditable2");
+    document->setFocusedElement(elementList[6]);
+    textInputInfo = webViewImpl->textInputInfo();
+    // No Next/Previous element for elements outside form.
+    EXPECT_NE(WebTextInputFlagHaveNextFocusableElement | WebTextInputFlagHavePreviousFocusableElement, textInputInfo.flags);
+    webViewImpl->advanceFocusInForm(WebFocusTypeBackward);
+    EXPECT_EQ(elementList[6], document->focusedElement());
+    webViewImpl->advanceFocusInForm(WebFocusTypeForward);
+    EXPECT_EQ(elementList[6], document->focusedElement());
+
+    elementList[7] = document->getElementById("textarea3");
+    document->setFocusedElement(elementList[7]);
+    textInputInfo = webViewImpl->textInputInfo();
+    // No Next/Previous element for elements outside form.
+    EXPECT_NE(defaultTextInputFlags | WebTextInputFlagHaveNextFocusableElement | WebTextInputFlagHavePreviousFocusableElement, textInputInfo.flags);
+    webViewImpl->advanceFocusInForm(WebFocusTypeBackward);
+    EXPECT_EQ(elementList[7], document->focusedElement());
+    webViewImpl->advanceFocusInForm(WebFocusTypeForward);
+    EXPECT_EQ(elementList[7], document->focusedElement());
+
+    elementList[8] = document->getElementById("textarea4");
+    document->setFocusedElement(elementList[8]);
+    textInputInfo = webViewImpl->textInputInfo();
+    EXPECT_EQ(defaultTextInputFlags | WebTextInputFlagListeningToKeyboardEvents | WebTextInputFlagHaveNextFocusableElement, textInputInfo.flags);
+    webViewImpl->advanceFocusInForm(WebFocusTypeForward);
+    elementList[9] = document->getElementById("input4");
+    EXPECT_EQ(elementList[9], document->focusedElement());
+    textInputInfo = webViewImpl->textInputInfo();
+    EXPECT_EQ(defaultTextInputFlags | WebTextInputFlagListeningToKeyboardEvents | WebTextInputFlagHaveNextFocusableElement | WebTextInputFlagHavePreviousFocusableElement, textInputInfo.flags);
+    webViewImpl->advanceFocusInForm(WebFocusTypeForward);
+    elementList[10] = document->getElementById("contenteditable3");
+    EXPECT_EQ(elementList[10], document->focusedElement());
+    textInputInfo = webViewImpl->textInputInfo();
+    EXPECT_EQ(WebTextInputFlagListeningToKeyboardEvents | WebTextInputFlagHavePreviousFocusableElement, textInputInfo.flags);
+    webViewImpl->advanceFocusInForm(WebFocusTypeForward);
+    EXPECT_EQ(elementList[10], document->focusedElement());
+
+    webViewImpl->advanceFocusInForm(WebFocusTypeBackward);
+    elementList[9] = document->getElementById("input4");
+    EXPECT_EQ(elementList[9], document->focusedElement());
+    webViewImpl->advanceFocusInForm(WebFocusTypeBackward);
+    elementList[8] = document->getElementById("textarea4");
+    EXPECT_EQ(elementList[8], document->focusedElement());
+    webViewImpl->advanceFocusInForm(WebFocusTypeBackward);
+    EXPECT_EQ(elementList[8], document->focusedElement());
+    m_webViewHelper.reset();
+}
+
 } // namespace blink