Support parsing BackgroundSpans and UnderlineSpans in Android IME's commitText()

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 835 matching lines @@
   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");
 
-  controller().commitText("hello", 0);
+  Vector<CompositionUnderline> underlines;
+  underlines.append(CompositionUnderline(0, 2, Color(255, 0, 0), false, 0));
+  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());
   EXPECT_EQ(3u, controller().getSelectionOffsets().end());
@@ skipping 93 matching lines @@
 TEST_F(InputMethodControllerTest, CompositionInputEventForInsert) {
   createHTMLWithCompositionInputEventListeners();
 
   // Simulate composition in the |contentEditable|.
   Vector<CompositionUnderline> underlines;
   underlines.append(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
 
   // Insert new text without previous composition.
   document().setTitle(emptyString());
   document().updateStyleAndLayout();
-  controller().commitText("hello", 0);
+  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", 1);
+  controller().commitText("hello", underlines, 1);
   EXPECT_STREQ(
       "beforeinput.data:hello;input.data:hello;compositionend.data:hello;",
       document().title().utf8().data());
 }
 
 TEST_F(InputMethodControllerTest, CompositionEndEventForConfirm) {
   createHTMLWithCompositionEndEventListener(CaretSelection);
 
   // Simulate composition in the |contentEditable|.
   Vector<CompositionUnderline> underlines;
@@ skipping 17 matching lines @@
 
   // Simulate composition in the |contentEditable|.
   Vector<CompositionUnderline> underlines;
   underlines.append(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
 
   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", -1);
+  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;
@@ skipping 46 matching lines @@
   EXPECT_EQ(WebTextInputTypeNone, controller().textInputType());
 
   document().getElementById("b")->focus();
   EXPECT_EQ(WebTextInputTypeTelephone, controller().textInputType());
 
   controller().finishComposingText(InputMethodController::KeepSelection);
   EXPECT_EQ(WebTextInputTypeTelephone, controller().textInputType());
 }
 
 }  // namespace blink