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 189 matching lines @@
 
     input->setValue("hello");
     controller().setEditableSelectionOffsets(PlainTextRange(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);
-    EXPECT_STREQ("heABllo", input->value().utf8().data());
-    EXPECT_EQ(0u, controller().getSelectionOffsets().start());
-    EXPECT_EQ(0u, controller().getSelectionOffsets().end());
-
     // The cursor is on left boundary.
     // "*heABllo".
     controller().setComposition("AB", underlines, -2, -2);
     EXPECT_STREQ("heABllo", input->value().utf8().data());
     EXPECT_EQ(0u, controller().getSelectionOffsets().start());
     EXPECT_EQ(0u, controller().getSelectionOffsets().end());
 
     // The cursor is before the composing text.
     // "he*ABllo".
     controller().setComposition("AB", underlines, 0, 0);
     EXPECT_STREQ("heABllo", input->value().utf8().data());
     EXPECT_EQ(2u, controller().getSelectionOffsets().start());
     EXPECT_EQ(2u, controller().getSelectionOffsets().end());
 
     // The cursor is after the composing text.
     // "heAB*llo".
     controller().setComposition("AB", underlines, 2, 2);
     EXPECT_STREQ("heABllo", input->value().utf8().data());
     EXPECT_EQ(4u, controller().getSelectionOffsets().start());
     EXPECT_EQ(4u, controller().getSelectionOffsets().end());
 
     // The cursor is on right boundary.
     // "heABllo*".
     controller().setComposition("AB", underlines, 5, 5);
     EXPECT_STREQ("heABllo", input->value().utf8().data());
     EXPECT_EQ(7u, controller().getSelectionOffsets().start());
     EXPECT_EQ(7u, controller().getSelectionOffsets().end());
-
-    // The cursor exceeds right boundary.
-    // "heABllo*".
-    controller().setComposition("AB", underlines, 100, 100);
-    EXPECT_STREQ("heABllo", input->value().utf8().data());
-    EXPECT_EQ(7u, controller().getSelectionOffsets().start());
-    EXPECT_EQ(7u, controller().getSelectionOffsets().end());
 }
 
 TEST_F(InputMethodControllerTest, SetCompositionForContentEditableWithDifferentNewCursorPositions)
 {
     // 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));
     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);
-    EXPECT_STREQ("hello\nworld\n01234AB56789", div->innerText().utf8().data());
-    EXPECT_EQ(0u, controller().getSelectionOffsets().start());
-    EXPECT_EQ(0u, controller().getSelectionOffsets().end());
-
     // The cursor is on left boundary.
     // "*hello\nworld\n01234AB56789".
     controller().setComposition("AB", underlines, -17, -17);
     EXPECT_STREQ("hello\nworld\n01234AB56789", div->innerText().utf8().data());
     EXPECT_EQ(0u, controller().getSelectionOffsets().start());
     EXPECT_EQ(0u, controller().getSelectionOffsets().end());
 
     // The cursor is in the 1st node.
     // "he*llo\nworld\n01234AB56789".
     controller().setComposition("AB", underlines, -15, -15);
@@ skipping 42 matching lines @@
     EXPECT_STREQ("hello\nworld\n01234AB56789", div->innerText().utf8().data());
     EXPECT_EQ(19u, controller().getSelectionOffsets().start());
     EXPECT_EQ(19u, controller().getSelectionOffsets().end());
 
     // The cursor is on right boundary.
     // "hello\nworld\n01234AB56789*".
     controller().setComposition("AB", underlines, 7, 7);
     EXPECT_STREQ("hello\nworld\n01234AB56789", div->innerText().utf8().data());
     EXPECT_EQ(24u, controller().getSelectionOffsets().start());
     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(PlainTextRange(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