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

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

Index: third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp
diff --git a/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp b/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp
index b176244dce8033ea84b758f52b67d042185fbfce..aac0b3c297cc734c3c48cd7cc9655fa2da82aeaf 100644
--- a/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp
+++ b/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp
@@ -207,13 +207,6 @@ TEST_F(InputMethodControllerTest, SetCompositionForInputWithDifferentNewCursorPo
     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);
@@ -241,13 +234,6 @@ TEST_F(InputMethodControllerTest, SetCompositionForInputWithDifferentNewCursorPo
     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)
@@ -270,13 +256,6 @@ TEST_F(InputMethodControllerTest, SetCompositionForContentEditableWithDifferentN
     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);
@@ -339,13 +318,36 @@ TEST_F(InputMethodControllerTest, SetCompositionForContentEditableWithDifferentN
     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)