Add support for persisting CompositionUnderlines in InputMethodController

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 153 matching lines @@
   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>hello world</div>", "sample");
 
   Vector<CompositionUnderline> underlines;
-  underlines.push_back(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(0, 5, Color(255, 0, 0), false, 0, false));
   controller().setCompositionFromExistingText(underlines, 0, 5);
 
   Range* range = controller().compositionRange();
   EXPECT_EQ(0, range->startOffset());
   EXPECT_EQ(5, range->endOffset());
 
   PlainTextRange plainTextRange(PlainTextRange::create(*div, *range));
   EXPECT_EQ(0u, plainTextRange.start());
   EXPECT_EQ(5u, plainTextRange.end());
 }
 
 TEST_F(InputMethodControllerTest, SetCompositionKeepingStyle) {
   Element* div = insertHTMLElement(
       "<div id='sample' "
       "contenteditable>abc1<b>2</b>34567<b>8</b>9d<b>e</b>f</div>",
       "sample");
 
   Vector<CompositionUnderline> underlines;
-  underlines.push_back(CompositionUnderline(3, 12, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(3, 12, Color(255, 0, 0), false, 0, false));
   controller().setCompositionFromExistingText(underlines, 3, 12);
 
   // Subtract a character.
   controller().setComposition(String("12345789"), underlines, 8, 8);
   EXPECT_STREQ("abc1<b>2</b>3457<b>8</b>9d<b>e</b>f",
                div->innerHTML().utf8().data());
   EXPECT_EQ(11u, controller().getSelectionOffsets().start());
   EXPECT_EQ(11u, controller().getSelectionOffsets().end());
 
   // Append a character.
   controller().setComposition(String("123456789"), underlines, 9, 9);
   EXPECT_STREQ("abc1<b>2</b>34567<b>8</b>9d<b>e</b>f",
                div->innerHTML().utf8().data());
   EXPECT_EQ(12u, controller().getSelectionOffsets().start());
   EXPECT_EQ(12u, controller().getSelectionOffsets().end());
 
   // Subtract and append characters.
   controller().setComposition(String("123hello789"), underlines, 11, 11);
   EXPECT_STREQ("abc1<b>2</b>3hello7<b>8</b>9d<b>e</b>f",
                div->innerHTML().utf8().data());
 }
 
 TEST_F(InputMethodControllerTest, SetCompositionWithEmojiKeepingStyle) {
   // U+1F3E0 = 0xF0 0x9F 0x8F 0xA0 (UTF8). It's an emoji character.
   Element* div = insertHTMLElement(
       "<div id='sample' contenteditable><b>&#x1f3e0</b></div>", "sample");
 
   Vector<CompositionUnderline> underlines;
-  underlines.push_back(CompositionUnderline(0, 2, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(0, 2, Color(255, 0, 0), false, 0, false));
 
   controller().setCompositionFromExistingText(underlines, 0, 2);
 
   // 0xF0 0x9F 0x8F 0xAB is also an emoji character, with the same leading
   // surrogate pair to the previous one.
   controller().setComposition(String::fromUTF8("\xF0\x9F\x8F\xAB"), underlines,
                               2, 2);
   EXPECT_STREQ("<b>\xF0\x9F\x8F\xAB</b>", div->innerHTML().utf8().data());
 
   controller().setComposition(String::fromUTF8("\xF0\x9F\x8F\xA0"), underlines,
                               2, 2);
   EXPECT_STREQ("<b>\xF0\x9F\x8F\xA0</b>", div->innerHTML().utf8().data());
 }
 
 TEST_F(InputMethodControllerTest,
        SetCompositionWithTeluguSignVisargaKeepingStyle) {
   // U+0C03 = 0xE0 0xB0 0x83 (UTF8), a telugu sign visarga with one code point.
   // It's one grapheme cluster if separated. It can also form one grapheme
   // cluster with another code point(e.g, itself).
   Element* div = insertHTMLElement(
       "<div id='sample' contenteditable><b>&#xc03</b></div>", "sample");
 
   Vector<CompositionUnderline> underlines;
-  underlines.push_back(CompositionUnderline(0, 2, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(0, 2, Color(255, 0, 0), false, 0, false));
   controller().setCompositionFromExistingText(underlines, 0, 1);
 
   // 0xE0 0xB0 0x83 0xE0 0xB0 0x83, a telugu character with 2 code points in
   // 1 grapheme cluster.
   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.push_back(CompositionUnderline(3, 12, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(3, 12, Color(255, 0, 0), false, 0, false));
   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, CommitTextKeepingStyle) {
   Element* div = insertHTMLElement(
       "<div id='sample' "
       "contenteditable>abc1<b>2</b>34567<b>8</b>9</div>",
       "sample");
 
   Vector<CompositionUnderline> underlines;
-  underlines.push_back(CompositionUnderline(3, 12, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(3, 12, Color(255, 0, 0), false, 0, false));
   controller().setCompositionFromExistingText(underlines, 3, 12);
 
   controller().commitText(String("123789"), underlines, 0);
   EXPECT_STREQ("abc1<b>2</b>37<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.push_back(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(0, 5, Color(255, 0, 0), false, 0, false));
   controller().setCompositionFromExistingText(underlines, 0, 5);
 
   controller().finishComposingText(InputMethodController::KeepSelection);
   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 ");
   document().updateStyleAndLayout();
   controller().setEditableSelectionOffsets(PlainTextRange(4, 4));
   EXPECT_STREQ("foo ", input->value().utf8().data());
   controller().extendSelectionAndDelete(0, 0);
   EXPECT_STREQ("foo ", input->value().utf8().data());
 
   input->setValue("foo ");
   document().updateStyleAndLayout();
   controller().setEditableSelectionOffsets(PlainTextRange(4, 4));
   EXPECT_STREQ("foo ", input->value().utf8().data());
   controller().extendSelectionAndDelete(1, 0);
   EXPECT_STREQ("foo", input->value().utf8().data());
 
   Vector<CompositionUnderline> underlines;
-  underlines.push_back(CompositionUnderline(0, 3, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(0, 3, Color(255, 0, 0), false, 0, false));
   controller().setCompositionFromExistingText(underlines, 0, 3);
 
   controller().setComposition(String(""), underlines, 0, 3);
 
   EXPECT_STREQ("", input->value().utf8().data());
 }
 
 TEST_F(InputMethodControllerTest,
        SetCompositionFromExistingTextWithCollapsedWhiteSpace) {
   // Creates a div with one leading new line char. The new line char is hidden
   // from the user and IME, but is visible to InputMethodController.
   Element* div = insertHTMLElement(
       "<div id='sample' contenteditable>\nhello world</div>", "sample");
 
   Vector<CompositionUnderline> underlines;
-  underlines.push_back(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(0, 5, Color(255, 0, 0), false, 0, false));
   controller().setCompositionFromExistingText(underlines, 0, 5);
 
   Range* range = controller().compositionRange();
   EXPECT_EQ(1, range->startOffset());
   EXPECT_EQ(6, range->endOffset());
 
   PlainTextRange plainTextRange(PlainTextRange::create(*div, *range));
   EXPECT_EQ(0u, plainTextRange.start());
   EXPECT_EQ(5u, plainTextRange.end());
 }
 
 TEST_F(InputMethodControllerTest,
        SetCompositionFromExistingTextWithInvalidOffsets) {
   insertHTMLElement("<div id='sample' contenteditable>test</div>", "sample");
 
   Vector<CompositionUnderline> underlines;
-  underlines.push_back(CompositionUnderline(7, 8, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(7, 8, Color(255, 0, 0), false, 0, false));
   controller().setCompositionFromExistingText(underlines, 7, 8);
 
   EXPECT_FALSE(controller().compositionRange());
 }
 
 TEST_F(InputMethodControllerTest, ConfirmPasswordComposition) {
   HTMLInputElement* input = toHTMLInputElement(insertHTMLElement(
       "<input id='sample' type='password' size='24'>", "sample"));
 
   Vector<CompositionUnderline> underlines;
-  underlines.push_back(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(0, 5, Color(255, 0, 0), false, 0, false));
   controller().setComposition("foo", underlines, 0, 3);
   controller().finishComposingText(InputMethodController::KeepSelection);
 
   EXPECT_STREQ("foo", input->value().utf8().data());
 }
 
 TEST_F(InputMethodControllerTest, DeleteSurroundingTextWithEmptyText) {
   HTMLInputElement* input =
       toHTMLInputElement(insertHTMLElement("<input id='sample'>", "sample"));
 
@@ skipping 313 matching lines @@
       toHTMLInputElement(insertHTMLElement("<input id='sample'>", "sample"));
 
   input->setValue("hello");
   document().updateStyleAndLayout();
   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.push_back(CompositionUnderline(0, 2, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(0, 2, Color(255, 0, 0), false, 0, false));
 
   // The caret exceeds left boundary.
   // "*heABllo", where * stands for caret.
   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 caret is on left boundary.
   // "*heABllo".
@@ skipping 43 matching lines @@
       "</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.push_back(CompositionUnderline(0, 2, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(0, 2, Color(255, 0, 0), false, 0, false));
 
   // The caret exceeds left boundary.
   // "*hello\nworld\n01234AB56789", where * stands for caret.
   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 caret is on left boundary.
   // "*hello\nworld\n01234AB56789".
@@ skipping 69 matching lines @@
 TEST_F(InputMethodControllerTest, SetCompositionWithEmptyText) {
   Element* div = insertHTMLElement(
       "<div id='sample' contenteditable>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.push_back(CompositionUnderline(0, 0, Color(255, 0, 0), false, 0));
+  underlines0.push_back(
+      CompositionUnderline(0, 0, Color(255, 0, 0), false, 0, false));
   Vector<CompositionUnderline> underlines2;
-  underlines2.push_back(CompositionUnderline(0, 2, Color(255, 0, 0), false, 0));
+  underlines2.push_back(
+      CompositionUnderline(0, 2, Color(255, 0, 0), false, 0, false));
 
   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, InsertLineBreakWhileComposingText) {
   Element* div =
       insertHTMLElement("<div id='sample' contenteditable></div>", "sample");
 
   Vector<CompositionUnderline> underlines;
-  underlines.push_back(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(0, 5, Color(255, 0, 0), false, 0, false));
   controller().setComposition("hello", underlines, 5, 5);
   EXPECT_STREQ("hello", div->innerText().utf8().data());
   EXPECT_EQ(5u, controller().getSelectionOffsets().start());
   EXPECT_EQ(5u, controller().getSelectionOffsets().end());
 
   frame().editor().insertLineBreak();
   EXPECT_STREQ("\n\n", div->innerText().utf8().data());
   EXPECT_EQ(1u, controller().getSelectionOffsets().start());
   EXPECT_EQ(1u, controller().getSelectionOffsets().end());
 }
 
 TEST_F(InputMethodControllerTest, InsertLineBreakAfterConfirmingText) {
   Element* div =
       insertHTMLElement("<div id='sample' contenteditable></div>", "sample");
 
   Vector<CompositionUnderline> underlines;
-  underlines.append(CompositionUnderline(0, 2, Color(255, 0, 0), false, 0));
+  underlines.append(
+      CompositionUnderline(0, 2, Color(255, 0, 0), false, 0, false));
   controller().commitText("hello", underlines, 0);
   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());
@@ skipping 10 matching lines @@
       "  event => document.title = "
       "  `beforeinput.isComposing:${event.isComposing};`);"
       "document.getElementById('sample').addEventListener('input', "
       "  event => document.title += "
       "  `input.isComposing:${event.isComposing};`);");
   document().body()->appendChild(script);
   document().view()->updateAllLifecyclePhases();
 
   // Simulate composition in the |contentEditable|.
   Vector<CompositionUnderline> underlines;
-  underlines.push_back(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(0, 5, Color(255, 0, 0), false, 0, false));
   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().finishComposingText(InputMethodController::KeepSelection);
   // 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, CompositionInputEventForReplace) {
   createHTMLWithCompositionInputEventListeners();
 
   // Simulate composition in the |contentEditable|.
   Vector<CompositionUnderline> underlines;
-  underlines.push_back(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(0, 5, Color(255, 0, 0), false, 0, false));
 
   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.
   document().setTitle(emptyString());
   controller().setComposition("hello", underlines, 0, 0);
   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.push_back(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(0, 5, Color(255, 0, 0), false, 0, false));
 
   document().setTitle(emptyString());
   controller().setComposition("hello", underlines, 5, 5);
   EXPECT_STREQ("beforeinput.data:hello;input.data:hello;",
                document().title().utf8().data());
 
   // Confirm the ongoing composition.
   document().setTitle(emptyString());
   controller().finishComposingText(InputMethodController::KeepSelection);
   EXPECT_STREQ(
       "beforeinput.data:hello;input.data:hello;compositionend.data:hello;",
       document().title().utf8().data());
 }
 
 TEST_F(InputMethodControllerTest, CompositionInputEventForDelete) {
   createHTMLWithCompositionInputEventListeners();
 
   // Simulate composition in the |contentEditable|.
   Vector<CompositionUnderline> underlines;
-  underlines.push_back(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(0, 5, Color(255, 0, 0), false, 0, false));
 
   document().setTitle(emptyString());
   controller().setComposition("hello", underlines, 5, 5);
   EXPECT_STREQ("beforeinput.data:hello;input.data:hello;",
                document().title().utf8().data());
 
   // Delete the existing composition.
   document().setTitle(emptyString());
   controller().setComposition("", underlines, 0, 0);
   EXPECT_STREQ("beforeinput.data:;compositionend.data:;",
                document().title().utf8().data());
 }
 
 TEST_F(InputMethodControllerTest, CompositionInputEventForInsert) {
   createHTMLWithCompositionInputEventListeners();
 
   // Simulate composition in the |contentEditable|.
   Vector<CompositionUnderline> underlines;
-  underlines.push_back(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(0, 5, Color(255, 0, 0), false, 0, false));
 
   // Insert new text without previous composition.
   document().setTitle(emptyString());
   document().updateStyleAndLayout();
   controller().commitText("hello", underlines, 0);
   EXPECT_STREQ("beforeinput.data:hello;input.data:hello;",
                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 new text with previous composition.
   document().setTitle(emptyString());
   document().updateStyleAndLayout();
   controller().commitText("hello", underlines, 1);
   EXPECT_STREQ(
       "beforeinput.data:hello;input.data:hello;compositionend.data:hello;",
       document().title().utf8().data());
 }
 
 TEST_F(InputMethodControllerTest, CompositionInputEventForInsertEmptyText) {
   createHTMLWithCompositionInputEventListeners();
 
   // Simulate composition in the |contentEditable|.
   Vector<CompositionUnderline> underlines;
-  underlines.push_back(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(0, 5, Color(255, 0, 0), false, 0, false));
 
   // Insert empty text without previous composition.
   document().setTitle(emptyString());
   document().updateStyleAndLayout();
   controller().commitText("", underlines, 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("", underlines, 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.push_back(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(0, 5, Color(255, 0, 0), false, 0, false));
 
   controller().setComposition("hello", underlines, 1, 1);
   document().updateStyleAndLayout();
   EXPECT_EQ(1u, controller().getSelectionOffsets().start());
   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_EQ(3u, controller().getSelectionOffsets().start());
   EXPECT_EQ(3u, controller().getSelectionOffsets().end());
 }
 
 TEST_F(InputMethodControllerTest, CompositionEndEventForInsert) {
   createHTMLWithCompositionEndEventListener(CaretSelection);
 
   // Simulate composition in the |contentEditable|.
   Vector<CompositionUnderline> underlines;
-  underlines.push_back(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(0, 5, Color(255, 0, 0), false, 0, false));
 
   controller().setComposition("n", underlines, 1, 1);
 
   // Insert new text with previous composition. Note that it moves the caret to
   // [4,4] before firing 'compositonend' event.
   document().updateStyleAndLayout();
   controller().commitText("hello", underlines, -1);
   document().updateStyleAndLayout();
   EXPECT_EQ(3u, controller().getSelectionOffsets().start());
   EXPECT_EQ(3u, controller().getSelectionOffsets().end());
 }
 
 TEST_F(InputMethodControllerTest, CompositionEndEventWithRangeSelection) {
   createHTMLWithCompositionEndEventListener(RangeSelection);
 
   // Simulate composition in the |contentEditable|.
   Vector<CompositionUnderline> underlines;
-  underlines.push_back(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(0, 5, Color(255, 0, 0), false, 0, false));
 
   controller().setComposition("hello", underlines, 1, 1);
   document().updateStyleAndLayout();
   EXPECT_EQ(1u, controller().getSelectionOffsets().start());
   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_EQ(2u, controller().getSelectionOffsets().start());
   EXPECT_EQ(4u, controller().getSelectionOffsets().end());
 }
 
 TEST_F(InputMethodControllerTest, CompositionEndEventWithNoSelection) {
   createHTMLWithCompositionEndEventListener(NoSelection);
 
   // Simulate composition in the |contentEditable|.
   Vector<CompositionUnderline> underlines;
-  underlines.push_back(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(0, 5, Color(255, 0, 0), false, 0, false));
 
   controller().setComposition("hello", underlines, 1, 1);
   document().updateStyleAndLayout();
   EXPECT_EQ(1u, controller().getSelectionOffsets().start());
   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();
@@ skipping 18 matching lines @@
   EXPECT_EQ(WebTextInputTypeTelephone, controller().textInputType());
 
   controller().finishComposingText(InputMethodController::KeepSelection);
   EXPECT_EQ(WebTextInputTypeTelephone, controller().textInputType());
 }
 
 TEST_F(InputMethodControllerTest, SetCompositionPlainTextWithUnderline) {
   insertHTMLElement("<div id='sample' contenteditable></div>", "sample");
 
   Vector<CompositionUnderline> underlines;
-  underlines.push_back(CompositionUnderline(0, 1, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(0, 1, Color(255, 0, 0), false, 0, false));
 
   controller().setComposition(" ", underlines, 1, 1);
 
   ASSERT_EQ(1u, document().markers().markers().size());
 
   EXPECT_EQ(0u, document().markers().markers()[0]->startOffset());
   EXPECT_EQ(1u, document().markers().markers()[0]->endOffset());
 }
 
 TEST_F(InputMethodControllerTest, CommitPlainTextWithUnderlineInsert) {
   insertHTMLElement("<div id='sample' contenteditable>Initial text.</div>",
                     "sample");
 
   Vector<CompositionUnderline> underlines;
 
   controller().setEditableSelectionOffsets(PlainTextRange(8, 8));
 
-  underlines.push_back(CompositionUnderline(1, 11, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(1, 11, Color(255, 0, 0), false, 0, false));
 
   controller().commitText(String("underlined"), underlines, 0);
 
   ASSERT_EQ(1u, document().markers().markers().size());
 
   EXPECT_EQ(9u, document().markers().markers()[0]->startOffset());
   EXPECT_EQ(19u, document().markers().markers()[0]->endOffset());
 }
 
 TEST_F(InputMethodControllerTest, CommitPlainTextWithUnderlineReplace) {
   insertHTMLElement("<div id='sample' contenteditable>Initial text.</div>",
                     "sample");
 
   Vector<CompositionUnderline> underlines;
 
   controller().setCompositionFromExistingText(underlines, 8, 12);
 
-  underlines.push_back(CompositionUnderline(1, 11, Color(255, 0, 0), false, 0));
+  underlines.push_back(
+      CompositionUnderline(1, 11, Color(255, 0, 0), false, 0, false));
 
   controller().commitText(String("string"), underlines, 0);
 
   ASSERT_EQ(1u, document().markers().markers().size());
 
   EXPECT_EQ(9u, document().markers().markers()[0]->startOffset());
   EXPECT_EQ(15u, document().markers().markers()[0]->endOffset());
 }
 
+TEST_F(InputMethodControllerTest, UnderlinePersistence) {
+  insertHTMLElement("<div id='sample' contenteditable>Initial text.</div>",
+                    "sample");
+  Vector<CompositionUnderline> emptyUnderlines;
+  controller().setCompositionFromExistingText(emptyUnderlines, 8, 12);
+
+  // Add non-persisting underline
+  Vector<CompositionUnderline> nonPersistingUnderlines;
+  nonPersistingUnderlines.push_back(
+      CompositionUnderline(1, 11, Color(255, 0, 0), false, 0, false));
+  controller().commitText(String("string"), nonPersistingUnderlines, 0);
+
+  EXPECT_EQ(1u, document().markers().markers().size());
+
+  // setCompositionFromExistingText() should clear the non-persisting underline
+  controller().setCompositionFromExistingText(emptyUnderlines, 0, 7);
+  EXPECT_EQ(0u, document().markers().markers().size());
+
+  // Add persisting underline.
+  Vector<CompositionUnderline> persistingUnderlines;
+  persistingUnderlines.push_back(
+      CompositionUnderline(1, 11, Color(255, 0, 0), false, 0, true));
+  controller().commitText(String("Replacement"), persistingUnderlines, 0);
+
+  EXPECT_EQ(1u, document().markers().markers().size());
+
+  // commitText() operation that should not affect the number of underlines
+  controller().setCompositionFromExistingText(emptyUnderlines, 11, 12);
+  controller().commitText(String(" "), emptyUnderlines, 0);
+
+  EXPECT_EQ(1u, document().markers().markers().size());
+
+  // finishComposingText() should not remove the persisting underline
+  controller().finishComposingText(InputMethodController::DoNotKeepSelection);
+
+  EXPECT_EQ(1u, document().markers().markers().size());
+}
+
+TEST_F(InputMethodControllerTest, DeleteStartOfMarker) {
+  insertHTMLElement("<div id='sample' contenteditable>Initial text.</div>",
+                    "sample");
+
+  Vector<CompositionUnderline> underlines;
+  underlines.push_back(
+      CompositionUnderline(0, 7, Color(255, 0, 0), false, 0, true));
+  // Underline "Initial" with a persisting underline
+  controller().setCompositionFromExistingText(underlines, 0, 7);
+
+  Vector<CompositionUnderline> emptyUnderlines;
+  // Set composition to "Ini"
+  controller().setCompositionFromExistingText(emptyUnderlines, 0, 3);
+  // Delete "Ini"
+  controller().commitText(String(""), emptyUnderlines, 0);
+
+  // Check that the underline is still attached to "tial"
+  EXPECT_EQ(1u, document().markers().markers().size());
+  EXPECT_EQ(0u, document().markers().markers()[0]->startOffset());
+  EXPECT_EQ(4u, document().markers().markers()[0]->endOffset());
+}
+
+TEST_F(InputMethodControllerTest, DeleteBeforeStartOfMarker) {
+  insertHTMLElement("<div id='sample' contenteditable>Initial text.</div>",
+                    "sample");
+
+  Vector<CompositionUnderline> underlines;
+  underlines.push_back(
+      CompositionUnderline(0, 4, Color(255, 0, 0), false, 0, true));
+  // Underline "text" with a persisting underline
+  controller().setCompositionFromExistingText(underlines, 8, 12);
+
+  Vector<CompositionUnderline> emptyUnderlines;
+  // Set composition to "Initial"
+  controller().setCompositionFromExistingText(emptyUnderlines, 0, 7);
+
+  // Delete "Initial"
+  controller().commitText(String(""), emptyUnderlines, 0);
+
+  // Check that the underline is still attached to "text"
+  EXPECT_EQ(1u, document().markers().markers().size());
+  EXPECT_EQ(1u, document().markers().markers()[0]->startOffset());
+  EXPECT_EQ(5u, document().markers().markers()[0]->endOffset());
+}
+
+TEST_F(InputMethodControllerTest, DeleteEndOfMarker) {
+  insertHTMLElement("<div id='sample' contenteditable>Initial text.</div>",
+                    "sample");
+
+  Vector<CompositionUnderline> underlines;
+  underlines.push_back(
+      CompositionUnderline(0, 4, Color(255, 0, 0), false, 0, true));
+  // Underline "text" with a persisting underline
+  controller().setCompositionFromExistingText(underlines, 8, 12);
+
+  Vector<CompositionUnderline> emptyUnderlines;
+  // Set composition to "xt."
+  controller().setCompositionFromExistingText(emptyUnderlines, 10, 13);
+
+  // Delete "xt."
+  controller().commitText(String(""), emptyUnderlines, 0);
+
+  // Check that the underline is still attached to "te"
+  EXPECT_EQ(1u, document().markers().markers().size());
+  EXPECT_EQ(8u, document().markers().markers()[0]->startOffset());
+  EXPECT_EQ(10u, document().markers().markers()[0]->endOffset());
+}
+
+TEST_F(InputMethodControllerTest, DeleteBeforeEndOfMarker) {
+  insertHTMLElement("<div id='sample' contenteditable>Initial text.</div>",
+                    "sample");
+
+  Vector<CompositionUnderline> underlines;
+  underlines.push_back(
+      CompositionUnderline(0, 4, Color(255, 0, 0), false, 0, true));
+  // Underline "text" with a persisting underline
+  controller().setCompositionFromExistingText(underlines, 8, 12);
+
+  Vector<CompositionUnderline> emptyUnderlines;
+  // Set composition to "Initial"
+  controller().setCompositionFromExistingText(emptyUnderlines, 0, 7);
+
+  // Delete "Initial"
+  controller().commitText(String(""), emptyUnderlines, 0);
+
+  // Check that the underline is still attached to "text"
+  EXPECT_EQ(1u, document().markers().markers().size());
+  EXPECT_EQ(1u, document().markers().markers()[0]->startOffset());
+  EXPECT_EQ(5u, document().markers().markers()[0]->endOffset());
+}
+
 }  // namespace blink