Remove replaceComposition() calls in finishComposingText.

third_party/WebKit/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 2688 matching lines @@
   event.x = 20;
   event.y = 20;
 
   // Just make sure we don't hit any asserts.
   webViewImpl->handleInputEvent(event);
 }
 
 class MockAutofillClient : public WebAutofillClient {
  public:
   MockAutofillClient()
-      : m_ignoreTextChanges(false),
+      : m_textChanges(0),
         m_textChangesFromUserGesture(0),
-        m_textChangesWhileIgnored(0),
-        m_textChangesWhileNotIgnored(0),
         m_userGestureNotificationsCount(0) {}
 
   ~MockAutofillClient() override {}
 
-  void setIgnoreTextChanges(bool ignore) override {
-    m_ignoreTextChanges = ignore;
-  }
   void textFieldDidChange(const WebFormControlElement&) override {
-    if (m_ignoreTextChanges)
-      ++m_textChangesWhileIgnored;
-    else
-      ++m_textChangesWhileNotIgnored;
+    ++m_textChanges;
 
     if (UserGestureIndicator::processingUserGesture())
       ++m_textChangesFromUserGesture;
   }
   void firstUserGestureObserved() override {
     ++m_userGestureNotificationsCount;
   }
 
-  void clearChangeCounts() {
-    m_textChangesWhileIgnored = 0;
-    m_textChangesWhileNotIgnored = 0;
-  }
+  void clearChangeCounts() { m_textChanges = 0; }
 
+  int textChanges() { return m_textChanges; }
   int textChangesFromUserGesture() { return m_textChangesFromUserGesture; }
-  int textChangesWhileIgnored() { return m_textChangesWhileIgnored; }
-  int textChangesWhileNotIgnored() { return m_textChangesWhileNotIgnored; }
   int getUserGestureNotificationsCount() {
     return m_userGestureNotificationsCount;
   }
 
  private:
-  bool m_ignoreTextChanges;
+  int m_textChanges;
   int m_textChangesFromUserGesture;
-  int m_textChangesWhileIgnored;
-  int m_textChangesWhileNotIgnored;
   int m_userGestureNotificationsCount;
 };
 
 TEST_P(WebViewTest, LosingFocusDoesNotTriggerAutofillTextChange) {
   URLTestHelpers::registerMockedURLFromBaseURL(
       WebString::fromUTF8(m_baseURL.c_str()),
       WebString::fromUTF8("input_field_populated.html"));
   MockAutofillClient client;
   WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
       m_baseURL + "input_field_populated.html");
   WebLocalFrameImpl* frame = webView->mainFrameImpl();
   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 = frame->inputMethodController()->textInputInfo();
   EXPECT_EQ(4, info.selectionStart);
   EXPECT_EQ(10, info.selectionEnd);
   EXPECT_EQ(8, info.compositionStart);
   EXPECT_EQ(12, info.compositionEnd);
 
   // 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(0, client.textChangesWhileNotIgnored());
+  EXPECT_EQ(0, client.textChanges());
 
   frame->setAutofillClient(0);
 }
 
 static void verifySelectionAndComposition(WebViewImpl* webView,
                                           int selectionStart,
                                           int selectionEnd,
                                           int compositionStart,
                                           int compositionEnd,
                                           const char* failMessage) {
@@ skipping 46 matching lines @@
 
     keyEvent.setType(WebInputEvent::KeyUp);
     webView->handleInputEvent(keyEvent);
 
     webView->advanceFocus(false);
   }
 
   frame->setAutofillClient(0);
 }
 
-TEST_P(WebViewTest, FinishComposingTextTriggersAutofillTextChange) {
+TEST_P(WebViewTest, FinishComposingTextDoesntTriggerAutofillTextChange) {
   URLTestHelpers::registerMockedURLFromBaseURL(
       WebString::fromUTF8(m_baseURL.c_str()),
       WebString::fromUTF8("input_field_populated.html"));
   MockAutofillClient client;
   WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
       m_baseURL + "input_field_populated.html");
   WebLocalFrameImpl* frame = webView->mainFrameImpl();
   frame->setAutofillClient(&client);
   webView->setInitialFocus(false);
+
+  WebDocument document = webView->mainFrame()->document();
+  HTMLFormControlElement* form =
+      toHTMLFormControlElement(document.getElementById("sample"));
+
   WebInputMethodController* activeInputMethodController =
       frame->frameWidget()->getActiveWebInputMethodController();
   // Set up a composition that needs to be committed.
   std::string compositionText("testingtext");
 
   WebVector<WebCompositionUnderline> emptyUnderlines;
   activeInputMethodController->setComposition(
       WebString::fromUTF8(compositionText.c_str()), emptyUnderlines, 0,
       compositionText.length());
 
   WebTextInputInfo info = activeInputMethodController->textInputInfo();
   EXPECT_EQ(0, info.selectionStart);
   EXPECT_EQ((int)compositionText.length(), info.selectionEnd);
   EXPECT_EQ(0, info.compositionStart);
   EXPECT_EQ((int)compositionText.length(), info.compositionEnd);
 
+  form->setAutofilled(true);
   client.clearChangeCounts();
+
   activeInputMethodController->finishComposingText(
       WebInputMethodController::KeepSelection);
-  EXPECT_EQ(0, client.textChangesWhileIgnored());
-  EXPECT_EQ(1, client.textChangesWhileNotIgnored());
+  EXPECT_EQ(0, client.textChanges());
+
+  EXPECT_TRUE(form->isAutofilled());
 
   frame->setAutofillClient(0);
 }
 
 TEST_P(WebViewTest, SetCompositionFromExistingTextTriggersAutofillTextChange) {

[yabinh, 2017/01/28 06:10:59]

The name should be ...DoesntTrigger...?

[aelias_OOO_until_Jul13, 2017/01/28 06:38:49]

Done.

   URLTestHelpers::registerMockedURLFromBaseURL(
       WebString::fromUTF8(m_baseURL.c_str()),
       WebString::fromUTF8("input_field_populated.html"));
   MockAutofillClient client;
   WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
       m_baseURL + "input_field_populated.html", true);
   WebLocalFrameImpl* frame = webView->mainFrameImpl();
   frame->setAutofillClient(&client);
   webView->setInitialFocus(false);
 
   WebVector<WebCompositionUnderline> emptyUnderlines;
 
   client.clearChangeCounts();
   frame->setCompositionFromExistingText(8, 12, emptyUnderlines);
 
   WebTextInputInfo info = frame->inputMethodController()->textInputInfo();
   EXPECT_EQ("0123456789abcdefghijklmnopqrstuvwxyz",
             std::string(info.value.utf8().data()));
   EXPECT_EQ(8, info.compositionStart);
   EXPECT_EQ(12, info.compositionEnd);
 
-  EXPECT_EQ(0, client.textChangesWhileIgnored());
-  EXPECT_EQ(0, client.textChangesWhileNotIgnored());
+  EXPECT_EQ(0, client.textChanges());
 
   WebDocument document = webView->mainFrame()->document();
   EXPECT_EQ(WebString::fromUTF8("none"),
             document.getElementById("inputEvent").firstChild().nodeValue());
 
   frame->setAutofillClient(0);
 }
 
 class ViewCreatingWebViewClient : public FrameTestHelpers::TestWebViewClient {
  public:
@@ skipping 1461 matching lines @@
   EXPECT_EQ(expectedWidth, vwElement->offsetWidth());
   EXPECT_EQ(expectedHeight, vwElement->offsetHeight());
 
   webView->resize(WebSize(800, 600));
   frame->printEnd();
 
   EXPECT_EQ(800, vwElement->offsetWidth());
 }
 
 }  // namespace blink