Introduce InsertIncrementalTextCommand to respect existing style for composition

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 232 matching lines @@
   controller().setComposition(String::fromUTF8("\xE0\xB0\x83\xE0\xB0\x83"),
                               underlines, 2, 2);
   EXPECT_STREQ("<b>\xE0\xB0\x83\xE0\xB0\x83</b>",
                div->innerHTML().utf8().data());
 
   controller().setComposition(String::fromUTF8("\xE0\xB0\x83"), underlines, 1,
                               1);
   EXPECT_STREQ("<b>\xE0\xB0\x83</b>", div->innerHTML().utf8().data());
 }
 
+TEST_F(InputMethodControllerTest, FinishComposingTextKeepingStyle) {
+  Element* div = insertHTMLElement(
+      "<div id='sample' "
+      "contenteditable>abc1<b>2</b>34567<b>8</b>9</div>",
+      "sample");
+
+  Vector<CompositionUnderline> underlines;
+  underlines.append(CompositionUnderline(3, 12, Color(255, 0, 0), false, 0));
+  controller().setCompositionFromExistingText(underlines, 3, 12);
+
+  controller().setComposition(String("123hello789"), underlines, 11, 11);
+  EXPECT_STREQ("abc1<b>2</b>3hello7<b>8</b>9", div->innerHTML().utf8().data());
+
+  controller().finishComposingText(InputMethodController::KeepSelection);
+  EXPECT_STREQ("abc1<b>2</b>3hello7<b>8</b>9", div->innerHTML().utf8().data());
+}
+
 TEST_F(InputMethodControllerTest, SelectionOnConfirmExistingText) {
   insertHTMLElement("<div id='sample' contenteditable>hello world</div>",
                     "sample");
 
   Vector<CompositionUnderline> underlines;
   underlines.append(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
   controller().setCompositionFromExistingText(underlines, 0, 5);
 
   controller().finishComposingText(InputMethodController::KeepSelection);
   EXPECT_EQ(0, frame().selection().start().computeOffsetInContainerNode());
@@ skipping 641 matching lines @@
   // Simulate composition in the |contentEditable|.
   Vector<CompositionUnderline> underlines;
   underlines.append(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
 
   document().setTitle(emptyString());
   controller().setComposition("hell", underlines, 4, 4);
   EXPECT_STREQ("beforeinput.data:hell;input.data:hell;",
                document().title().utf8().data());
 
   // Replace the existing composition.
-  // TODO(yabinh): should be "beforeinput.data:hello;input.data:hello;".
   document().setTitle(emptyString());
   controller().setComposition("hello", underlines, 0, 0);
-  EXPECT_STREQ("beforeinput.data:o;input.data:o;",
+  EXPECT_STREQ("beforeinput.data:hello;input.data:hello;",
                document().title().utf8().data());
 }
 
 TEST_F(InputMethodControllerTest, CompositionInputEventForConfirm) {
   createHTMLWithCompositionInputEventListeners();
 
   // Simulate composition in the |contentEditable|.
   Vector<CompositionUnderline> underlines;
   underlines.append(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
 
@@ skipping 49 matching lines @@
                document().title().utf8().data());
 
   // Insert new text with previous composition.
   document().setTitle(emptyString());
   document().updateStyleAndLayout();
   controller().commitText("hello", 1);
   EXPECT_STREQ(
       "beforeinput.data:hello;input.data:hello;compositionend.data:hello;",
       document().title().utf8().data());
 }
 

[yabinh, 2016/11/25 04:36:27]

It's better to have a test for inserting empty text. (BTW, this test can pass
without applying this patch).

+TEST_F(InputMethodControllerTest, CompositionInputEventForInsertEmptyText) {
+  createHTMLWithCompositionInputEventListeners();
+
+  // Simulate composition in the |contentEditable|.
+  Vector<CompositionUnderline> underlines;
+  underlines.append(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
+
+  // Insert empty text without previous composition.
+  document().setTitle(emptyString());
+  document().updateStyleAndLayout();
+  controller().commitText("", 0);
+  EXPECT_STREQ("", document().title().utf8().data());
+
+  document().setTitle(emptyString());
+  controller().setComposition("n", underlines, 1, 1);
+  EXPECT_STREQ("beforeinput.data:n;input.data:n;",
+               document().title().utf8().data());
+
+  // Insert empty text with previous composition.
+  document().setTitle(emptyString());
+  document().updateStyleAndLayout();
+  controller().commitText("", 1);
+  EXPECT_STREQ("beforeinput.data:;compositionend.data:;",
+               document().title().utf8().data());
+}
+
 TEST_F(InputMethodControllerTest, CompositionEndEventForConfirm) {
   createHTMLWithCompositionEndEventListener(CaretSelection);
 
   // Simulate composition in the |contentEditable|.
   Vector<CompositionUnderline> underlines;
   underlines.append(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
 
   controller().setComposition("hello", underlines, 1, 1);
   document().updateStyleAndLayout();
   EXPECT_EQ(1u, controller().getSelectionOffsets().start());
@@ skipping 58 matching lines @@
   EXPECT_EQ(1u, controller().getSelectionOffsets().end());
 
   // Confirm the ongoing composition. Note that it moves the caret to the end of
   // text [5,5] before firing 'compositonend' event.
   controller().finishComposingText(InputMethodController::DoNotKeepSelection);
   document().updateStyleAndLayout();
   EXPECT_TRUE(controller().getSelectionOffsets().isNull());
 }
 
 }  // namespace blink