[IME] Differentiate s_suppressNextKeypressEvent in WebViewImpl.

Source/web/tests/WebViewTest.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 1264 matching lines @@
     event.x = 25;
     event.y = 7;
     webView->handleInputEvent(event);
     runPendingTasks();
     EXPECT_EQ(25, client.longpressX());
     EXPECT_EQ(7, client.longpressY());
 
     m_webViewHelper.reset(); // Explicitly reset to break dependency on locally scoped client.
 }
 
+static void simulateKeyPress(WebView* webView, int windowsKeyCode)
+{
+    WebKeyboardEvent keyEvent;
+    if (windowsKeyCode != VK_UNKNOWN) {
+        keyEvent.windowsKeyCode = windowsKeyCode;
+        keyEvent.setKeyIdentifierFromWindowsKeyCode();
+    }
+    keyEvent.type = WebInputEvent::RawKeyDown;
+    webView->handleInputEvent(keyEvent);
+
+    keyEvent.type = WebInputEvent::KeyUp;
+    webView->handleInputEvent(keyEvent);
+}
+
 #if OS(ANDROID)
 TEST_F(WebViewTest, LongPressSelection)
 {
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("longpress_selection.html"));
 
     WebView* webView = m_webViewHelper.initializeAndLoad(m_baseURL + "longpress_selection.html", true);
     webView->resize(WebSize(500, 300));
     webView->layout();
     runPendingTasks();
 
@@ skipping 15 matching lines @@
     webView->resize(WebSize(640, 480));
     webView->layout();
     runPendingTasks();
 
     WebString target = WebString::fromUTF8("target");
     WebLocalFrameImpl* mainFrame = toWebLocalFrameImpl(webView->mainFrame());
 
     EXPECT_TRUE(tapElementById(webView, WebInputEvent::GestureLongPress, target));
     EXPECT_TRUE(mainFrame->frame()->selection().isCaretBlinkingSuspended());
 
-    WebKeyboardEvent keyEvent;
-    keyEvent.type = WebInputEvent::RawKeyDown;
-    webView->handleInputEvent(keyEvent);
-    keyEvent.type = WebInputEvent::KeyUp;
-    webView->handleInputEvent(keyEvent);
+    simulateKeyPress(webView, VK_UNKNOWN);
     EXPECT_FALSE(mainFrame->frame()->selection().isCaretBlinkingSuspended());
 }
 #endif
 
 TEST_F(WebViewTest, SelectionOnReadOnlyInput)
 {
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("selection_readonly.html"));
     WebView* webView = m_webViewHelper.initializeAndLoad(m_baseURL + "selection_readonly.html", true);
     webView->resize(WebSize(640, 480));
     webView->layout();
@@ skipping 70 matching lines @@
     int getUserGestureNotificationsCount() { return m_userGestureNotificationsCount; }
 
 private:
     bool m_ignoreTextChanges;
     int m_textChangesWhileIgnored;
     int m_textChangesWhileNotIgnored;
     int m_userGestureNotificationsCount;
 };
 
 
+static void verifySelectionAndComposition(WebView* webView, const char* value, int selectionStart, int selectionEnd, int compositionStart, int compositionEnd, const char* failMessage)
+{
+    WebTextInputInfo info = webView->textInputInfo();
+    if (value) {
+        EXPECT_EQ(std::string(value), std::string(info.value.utf8().data())) << failMessage;
+    }
+    EXPECT_EQ(selectionStart, info.selectionStart) << failMessage;
+    EXPECT_EQ(selectionEnd, info.selectionEnd) << failMessage;
+    EXPECT_EQ(compositionStart, info.compositionStart) << failMessage;
+    EXPECT_EQ(compositionEnd, info.compositionEnd) << failMessage;
+}
+
 TEST_F(WebViewTest, LosingFocusDoesNotTriggerAutofillTextChange)
 {
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("input_field_populated.html"));
     MockAutofillClient client;
     WebView* webView = m_webViewHelper.initializeAndLoad(m_baseURL + "input_field_populated.html");
     WebLocalFrameImpl* frame = toWebLocalFrameImpl(webView->mainFrame());
     frame->setAutofillClient(&client);
     webView->setInitialFocus(false);
 
     // Set up a composition that needs to be committed.
     WebVector<WebCompositionUnderline> emptyUnderlines;
     frame->setEditableSelectionOffsets(4, 10);
     frame->setCompositionFromExistingText(8, 12, emptyUnderlines);
-    WebTextInputInfo info = webView->textInputInfo();
-    EXPECT_EQ(4, info.selectionStart);
-    EXPECT_EQ(10, info.selectionEnd);
-    EXPECT_EQ(8, info.compositionStart);
-    EXPECT_EQ(12, info.compositionEnd);
+    verifySelectionAndComposition(webView, nullptr, 4, 10, 8, 12, "base case");
 
     // Clear the focus and track that the subsequent composition commit does not trigger a
     // text changed notification for autofill.
     client.clearChangeCounts();
     webView->setFocus(false);
     EXPECT_EQ(1, client.textChangesWhileIgnored());
     EXPECT_EQ(0, client.textChangesWhileNotIgnored());
 
     frame->setAutofillClient(0);
 }
 
+TEST_F(WebViewTest, CompositionChangeWithKeyEvents)
+{
+    URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("composition_with_key_events.html"));
+    MockAutofillClient client;
+    WebView* webView = m_webViewHelper.initializeAndLoad(m_baseURL + "composition_with_key_events.html");
+    WebLocalFrameImpl* frame = toWebLocalFrameImpl(webView->mainFrame());
+    frame->setAutofillClient(&client);
+    webView->setInitialFocus(false);
+
+    // Test both input elements.
+    for (int i = 0; i < 2; ++i) {
+        // Select composition and do sanity check.
+        WebVector<WebCompositionUnderline> emptyUnderlines;
+        frame->setEditableSelectionOffsets(2, 15);
+        frame->setCompositionFromExistingText(6, 11, emptyUnderlines);
+        verifySelectionAndComposition(webView, nullptr, 2, 15, 6, 11, "initial case");
+
+        // Press 'A' and verify that the composition grew.
+        simulateKeyPress(webView, VKEY_A);
+        verifySelectionAndComposition(webView, nullptr, 2, 16, 6, 12, "after pressing 'A'");
+
+        // Press Backspace and verify that the composition shrunk (and is not cancelled).
+        simulateKeyPress(webView, VKEY_BACK);
+        verifySelectionAndComposition(webView, nullptr, 2, 15, 6, 11, "after pressing Backspace");
+
+        webView->advanceFocus(false);
+    }
+}
+
 TEST_F(WebViewTest, ConfirmCompositionTriggersAutofillTextChange)
 {
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("input_field_populated.html"));
     MockAutofillClient client;
     WebView* webView = m_webViewHelper.initializeAndLoad(m_baseURL + "input_field_populated.html");
     WebLocalFrameImpl* frame = toWebLocalFrameImpl(webView->mainFrame());
     frame->setAutofillClient(&client);
     webView->setInitialFocus(false);
 
     // Set up a composition that needs to be committed.
@@ skipping 141 matching lines @@
     webView->setFocus(true);
 
     WebElement element = webView->mainFrame()->document().getElementById("message");
     EXPECT_STREQ("DOMFocusOutDOMFocusIn", element.innerText().utf8().data());
 }
 
 #if !ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 static void openDateTimeChooser(WebView* webView, HTMLInputElement* inputElement)
 {
     inputElement->focus();
-
-    WebKeyboardEvent keyEvent;
-    keyEvent.windowsKeyCode = VKEY_SPACE;
-    keyEvent.type = WebInputEvent::RawKeyDown;
-    keyEvent.setKeyIdentifierFromWindowsKeyCode();
-    webView->handleInputEvent(keyEvent);
-
-    keyEvent.type = WebInputEvent::KeyUp;
-    webView->handleInputEvent(keyEvent);
+    simulateKeyPress(webView, VKEY_SPACE);
 }
 
 TEST_F(WebViewTest, ChooseValueFromDateTimeChooser)
 {
     DateTimeChooserWebViewClient client;
     std::string url = m_baseURL + "date_time_chooser.html";
     URLTestHelpers::registerMockedURLLoad(toKURL(url), "date_time_chooser.html");
     WebViewImpl* webViewImpl = m_webViewHelper.initializeAndLoad(url, true, 0, &client);
 
     Document* document = webViewImpl->mainFrameImpl()->frame()->document();
@@ skipping 569 matching lines @@
 {
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("form.html"));
     MockAutofillClient client;
     WebView* webView = m_webViewHelper.initializeAndLoad(m_baseURL + "form.html", true);
     WebLocalFrameImpl* frame = toWebLocalFrameImpl(webView->mainFrame());
     frame->setAutofillClient(&client);
     webView->setInitialFocus(false);
 
     EXPECT_EQ(0, client.getUserGestureNotificationsCount());
 
-    WebKeyboardEvent keyEvent;
-    keyEvent.windowsKeyCode = VKEY_SPACE;
-    keyEvent.type = WebInputEvent::RawKeyDown;
-    keyEvent.setKeyIdentifierFromWindowsKeyCode();
-    webView->handleInputEvent(keyEvent);
-    keyEvent.type = WebInputEvent::KeyUp;
-    webView->handleInputEvent(keyEvent);
+    simulateKeyPress(webView, VKEY_SPACE);
 
     EXPECT_EQ(1, client.getUserGestureNotificationsCount());
     frame->setAutofillClient(0);
 }
 
 TEST_F(WebViewTest, FirstUserGestureObservedMouseEvent)
 {
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("form.html"));
     MockAutofillClient client;
     WebView* webView = m_webViewHelper.initializeAndLoad(m_baseURL + "form.html", true);
@@ skipping 218 matching lines @@
     // Test without any preventDefault.
     client.reset();
     frame->executeScript(WebScriptSource("setTest('none');"));
     EXPECT_TRUE(tapElementById(webView, WebInputEvent::GestureTap, WebString::fromUTF8("target")));
     EXPECT_TRUE(client.getWasCalled());
 
     m_webViewHelper.reset(); // Remove dependency on locally scoped client.
 }
 
 } // namespace