Handle newCursorPosition correctly for Android's commitText()

third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/editing/InputMethodController.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/Range.h"
 #include "core/editing/Editor.h"
@@ skipping 102 matching lines @@
 
 TEST_F(InputMethodControllerTest, SelectionOnConfirmExistingText)
 {
     insertHTMLElement(
         "<div id='sample' contenteditable='true'>hello world</div>", "sample");
 
     Vector<CompositionUnderline> underlines;
     underlines.append(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
     controller().setCompositionFromExistingText(underlines, 0, 5);
 
-    controller().confirmComposition();
+    controller().replaceComposition();
     EXPECT_EQ(0, frame().selection().start().computeOffsetInContainerNode());
     EXPECT_EQ(0, frame().selection().end().computeOffsetInContainerNode());
 }
 
 TEST_F(InputMethodControllerTest, DeleteBySettingEmptyComposition)
 {
     HTMLInputElement* input = toHTMLInputElement(
         insertHTMLElement("<input id='sample'>", "sample"));
 
     input->setValue("foo ");
@@ skipping 49 matching lines @@
 }
 
 TEST_F(InputMethodControllerTest, ConfirmPasswordComposition)
 {
     HTMLInputElement* input = toHTMLInputElement(
         insertHTMLElement("<input id='sample' type='password' size='24'>", "sample"));
 
     Vector<CompositionUnderline> underlines;
     underlines.append(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
     controller().setComposition("foo", underlines, 0, 3);
-    controller().confirmComposition();
+    controller().replaceComposition();
 
     EXPECT_STREQ("foo", input->value().utf8().data());
 }
 
 TEST_F(InputMethodControllerTest, SetCompositionForInputWithDifferentNewCursorPositions)
 {
     HTMLInputElement* input = toHTMLInputElement(
         insertHTMLElement("<input id='sample'>", "sample"));
 
     input->setValue("hello");
@@ skipping 194 matching lines @@
     EXPECT_EQ(1u, controller().getSelectionOffsets().start());
     EXPECT_EQ(1u, controller().getSelectionOffsets().end());
 }
 
 TEST_F(InputMethodControllerTest, InsertLineBreakAfterConfirmingText)
 {
     Element* div = insertHTMLElement(
         "<div id='sample' contenteditable='true'></div>",
         "sample");
 
-    controller().confirmCompositionOrInsertText("hello", InputMethodController::ConfirmCompositionBehavior::KeepSelection);
+    controller().confirmComposition("hello");
     EXPECT_STREQ("hello", div->innerText().utf8().data());
 
     controller().setEditableSelectionOffsets(PlainTextRange(2, 2));
     EXPECT_EQ(2u, controller().getSelectionOffsets().start());
     EXPECT_EQ(2u, controller().getSelectionOffsets().end());
 
     frame().editor().insertLineBreak();
     EXPECT_STREQ("he\nllo", div->innerText().utf8().data());
     EXPECT_EQ(3u, controller().getSelectionOffsets().start());
     EXPECT_EQ(3u, controller().getSelectionOffsets().end());
@@ skipping 18 matching lines @@
     // Simulate composition in the |contentEditable|.
     Vector<CompositionUnderline> underlines;
     underlines.append(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
     editable->focus();
 
     document().setTitle(emptyString());
     controller().setComposition("foo", underlines, 0, 3);
     EXPECT_STREQ("beforeinput.isComposing:true;input.isComposing:true;", document().title().utf8().data());
 
     document().setTitle(emptyString());
-    controller().confirmComposition();
+    controller().replaceComposition();
     // Last pair of InputEvent should also be inside composition scope.
     EXPECT_STREQ("beforeinput.isComposing:true;input.isComposing:true;", document().title().utf8().data());
 }
 
 TEST_F(InputMethodControllerTest, CompositionInputEventData)
 {
     document().settings()->setScriptEnabled(true);
     Element* editable = insertHTMLElement("<div id='sample' contentEditable='true'></div>", "sample");
     Element* script = document().createElement("script", ASSERT_NO_EXCEPTION);
     script->setInnerHTML(
@@ skipping 14 matching lines @@
 
     document().setTitle(emptyString());
     controller().setComposition("n", underlines, 0, 1);
     EXPECT_STREQ("beforeinput.data:n;input.data:n;", document().title().utf8().data());
 
     document().setTitle(emptyString());
     controller().setComposition("ni", underlines, 0, 1);
     EXPECT_STREQ("beforeinput.data:ni;input.data:ni;", document().title().utf8().data());
 
     document().setTitle(emptyString());
-    controller().confirmComposition();
+    controller().replaceComposition();
     EXPECT_STREQ("beforeinput.data:ni;input.data:ni;", document().title().utf8().data());
 }
 
 } // namespace blink