Reland: Fix setComposingText with empty text when newCursorPosition != 1

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/Element.h"
 #include "core/dom/Range.h"
 #include "core/editing/FrameSelection.h"
 #include "core/events/MouseEvent.h"
@@ skipping 37 matching lines @@
     element->focus();
     return element;
 }
 
 TEST_F(InputMethodControllerTest, BackspaceFromEndOfInput)
 {
     HTMLInputElement* input = toHTMLInputElement(
         insertHTMLElement("<input id='sample'>", "sample"));
 
     input->setValue("fooX");
-    controller().setEditableSelectionOffsets(PlainTextRange(4, 4));
+    controller().setEditableSelectionOffsets(4, 4);
     EXPECT_STREQ("fooX", input->value().utf8().data());
     controller().extendSelectionAndDelete(0, 0);
     EXPECT_STREQ("fooX", input->value().utf8().data());
 
     input->setValue("fooX");
-    controller().setEditableSelectionOffsets(PlainTextRange(4, 4));
+    controller().setEditableSelectionOffsets(4, 4);
     EXPECT_STREQ("fooX", input->value().utf8().data());
     controller().extendSelectionAndDelete(1, 0);
     EXPECT_STREQ("foo", input->value().utf8().data());
 
     input->setValue(String::fromUTF8("foo\xE2\x98\x85")); // U+2605 == "black star"
-    controller().setEditableSelectionOffsets(PlainTextRange(4, 4));
+    controller().setEditableSelectionOffsets(4, 4);
     EXPECT_STREQ("foo\xE2\x98\x85", input->value().utf8().data());
     controller().extendSelectionAndDelete(1, 0);
     EXPECT_STREQ("foo", input->value().utf8().data());
 
     input->setValue(String::fromUTF8("foo\xF0\x9F\x8F\x86")); // U+1F3C6 == "trophy"
-    controller().setEditableSelectionOffsets(PlainTextRange(4, 4));
+    controller().setEditableSelectionOffsets(4, 4);
     EXPECT_STREQ("foo\xF0\x9F\x8F\x86", input->value().utf8().data());
     controller().extendSelectionAndDelete(1, 0);
     EXPECT_STREQ("foo", input->value().utf8().data());
 
     input->setValue(String::fromUTF8("foo\xE0\xB8\x81\xE0\xB9\x89")); // composed U+0E01 "ka kai" + U+0E49 "mai tho"
-    controller().setEditableSelectionOffsets(PlainTextRange(4, 4));
+    controller().setEditableSelectionOffsets(4, 4);
     EXPECT_STREQ("foo\xE0\xB8\x81\xE0\xB9\x89", input->value().utf8().data());
     controller().extendSelectionAndDelete(1, 0);
     EXPECT_STREQ("foo", input->value().utf8().data());
 
     input->setValue("fooX");
-    controller().setEditableSelectionOffsets(PlainTextRange(4, 4));
+    controller().setEditableSelectionOffsets(4, 4);
     EXPECT_STREQ("fooX", input->value().utf8().data());
     controller().extendSelectionAndDelete(0, 1);
     EXPECT_STREQ("fooX", input->value().utf8().data());
 }
 
 TEST_F(InputMethodControllerTest, SetCompositionFromExistingText)
 {
     Element* div = insertHTMLElement(
         "<div id='sample' contenteditable='true'>hello world</div>", "sample");
 
@@ skipping 23 matching lines @@
     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 ");
-    controller().setEditableSelectionOffsets(PlainTextRange(4, 4));
+    controller().setEditableSelectionOffsets(4, 4);
     EXPECT_STREQ("foo ", input->value().utf8().data());
     controller().extendSelectionAndDelete(0, 0);
     EXPECT_STREQ("foo ", input->value().utf8().data());
 
     input->setValue("foo ");
-    controller().setEditableSelectionOffsets(PlainTextRange(4, 4));
+    controller().setEditableSelectionOffsets(4, 4);
     EXPECT_STREQ("foo ", input->value().utf8().data());
     controller().extendSelectionAndDelete(1, 0);
     EXPECT_STREQ("foo", input->value().utf8().data());
 
     Vector<CompositionUnderline> underlines;
     underlines.append(CompositionUnderline(0, 3, Color(255, 0, 0), false, 0));
     controller().setCompositionFromExistingText(underlines, 0, 3);
 
     controller().setComposition(String(""), underlines, 0, 3);
 
@@ skipping 43 matching lines @@
 
     EXPECT_STREQ("foo", input->value().utf8().data());
 }
 
 TEST_F(InputMethodControllerTest, SetCompositionForInputWithDifferentNewCursorPositions)
 {
     HTMLInputElement* input = toHTMLInputElement(
         insertHTMLElement("<input id='sample'>", "sample"));
 
     input->setValue("hello");
-    controller().setEditableSelectionOffsets(PlainTextRange(2, 2));
+    controller().setEditableSelectionOffsets(2, 2);
     EXPECT_STREQ("hello", input->value().utf8().data());
     EXPECT_EQ(2u, controller().getSelectionOffsets().start());
     EXPECT_EQ(2u, controller().getSelectionOffsets().end());
 
     Vector<CompositionUnderline> underlines;
     underlines.append(CompositionUnderline(0, 2, Color(255, 0, 0), false, 0));
 
     // The cursor exceeds left boundary.
     // "*heABllo", where * stands for cursor.
     controller().setComposition("AB", underlines, -100, -100);
@@ skipping 42 matching lines @@
     // There are 7 nodes and 5+1+5+1+3+4+3 characters: "hello", '\n', "world", "\n", "012", "3456", "789".
     Element* div = insertHTMLElement(
         "<div id='sample' contenteditable='true'>"
         "hello"
         "<div id='sample2' contenteditable='true'>world"
         "<p>012<b>3456</b><i>789</i></p>"
         "</div>"
         "</div>",
         "sample");
 
-    controller().setEditableSelectionOffsets(PlainTextRange(17, 17));
+    controller().setEditableSelectionOffsets(17, 17);
     EXPECT_STREQ("hello\nworld\n0123456789", div->innerText().utf8().data());
     EXPECT_EQ(17u, controller().getSelectionOffsets().start());
     EXPECT_EQ(17u, controller().getSelectionOffsets().end());
 
     Vector<CompositionUnderline> underlines;
     underlines.append(CompositionUnderline(0, 2, Color(255, 0, 0), false, 0));
 
     // The cursor exceeds left boundary.
     // "*hello\nworld\n01234AB56789", where * stands for cursor.
     controller().setComposition("AB", underlines, -100, -100);
@@ skipping 65 matching lines @@
     EXPECT_EQ(24u, controller().getSelectionOffsets().end());
 
     // The cursor exceeds right boundary.
     // "hello\nworld\n01234AB56789*".
     controller().setComposition("AB", underlines, 100, 100);
     EXPECT_STREQ("hello\nworld\n01234AB56789", div->innerText().utf8().data());
     EXPECT_EQ(24u, controller().getSelectionOffsets().start());
     EXPECT_EQ(24u, controller().getSelectionOffsets().end());
 }
 
+TEST_F(InputMethodControllerTest, SetCompositionWithEmptyText)
+{
+    Element* div = insertHTMLElement(
+        "<div id='sample' contenteditable='true'>hello</div>",
+        "sample");
+
+    controller().setEditableSelectionOffsets(2, 2);
+    EXPECT_STREQ("hello", div->innerText().utf8().data());
+    EXPECT_EQ(2u, controller().getSelectionOffsets().start());
+    EXPECT_EQ(2u, controller().getSelectionOffsets().end());
+
+    Vector<CompositionUnderline> underlines0;
+    underlines0.append(CompositionUnderline(0, 0, Color(255, 0, 0), false, 0));
+    Vector<CompositionUnderline> underlines2;
+    underlines2.append(CompositionUnderline(0, 2, Color(255, 0, 0), false, 0));
+
+    controller().setComposition("AB", underlines2, 2, 2);
+    // With previous composition.
+    controller().setComposition("", underlines0, 2, 2);
+    EXPECT_STREQ("hello", div->innerText().utf8().data());
+    EXPECT_EQ(4u, controller().getSelectionOffsets().start());
+    EXPECT_EQ(4u, controller().getSelectionOffsets().end());
+
+    // Without previous composition.
+    controller().setComposition("", underlines0, -1, -1);
+    EXPECT_STREQ("hello", div->innerText().utf8().data());
+    EXPECT_EQ(3u, controller().getSelectionOffsets().start());
+    EXPECT_EQ(3u, controller().getSelectionOffsets().end());
+}
+
 TEST_F(InputMethodControllerTest, CompositionFireBeforeInput)
 {
     document().settings()->setScriptEnabled(true);
     Element* editable = insertHTMLElement("<div id='sample' contentEditable='true'></div>", "sample");
     Element* script = document().createElement("script", ASSERT_NO_EXCEPTION);
     script->setInnerHTML(
         "document.getElementById('sample').addEventListener('beforeinput', function(event) {"
         "    document.title = `beforeinput.isComposing:${event.isComposing}`;"
         "});",
         ASSERT_NO_EXCEPTION);
     document().body()->appendChild(script, ASSERT_NO_EXCEPTION);
     document().view()->updateAllLifecyclePhases();
 
     // 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", document().title().utf8().data());
 
     document().setTitle(emptyString());
     controller().confirmComposition();
     // Last 'beforeinput' should also be inside composition scope.
     EXPECT_STREQ("beforeinput.isComposing:true", document().title().utf8().data());
 }
 
 } // namespace blink