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"
 #include "core/editing/FrameSelection.h"
 #include "core/events/MouseEvent.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/testing/DummyPageHolder.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.h"

[Yuta Kitamura, 2016/12/20 07:09:14]

You should write this as: #include "core/editing/..."

[rlanday, 2016/12/20 20:34:42]

Ah, that seems to resolve the issue. Thanks! I suppose I should've noticed the
other headers written like this...

 #include <memory>
 
 namespace blink {
 
 class InputMethodControllerTest : public ::testing::Test {
  protected:
   InputMethodController& controller() {
     return frame().inputMethodController();
   }
   Document& document() const { return *m_document; }
@@ skipping 248 matching lines @@
 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));
   controller().setCompositionFromExistingText(underlines, 3, 12);
 
-  controller().commitText(String("123789"), 0);
+  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));
   controller().setCompositionFromExistingText(underlines, 0, 5);
@@ skipping 586 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 92 matching lines @@
 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));
 
   // 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, CompositionInputEventForInsertEmptyText) {
   createHTMLWithCompositionInputEventListeners();
 
   // Simulate composition in the |contentEditable|.
   Vector<CompositionUnderline> underlines;
   underlines.push_back(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
 
   // Insert empty text without previous composition.
   document().setTitle(emptyString());
   document().updateStyleAndLayout();
-  controller().commitText("", 0);
+  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("", 1);
+  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));
@@ skipping 16 matching lines @@
 
   // Simulate composition in the |contentEditable|.
   Vector<CompositionUnderline> underlines;
   underlines.push_back(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 45 matching lines @@
   inputA->setOuterHTML("", ASSERT_NO_EXCEPTION);
   EXPECT_EQ(WebTextInputTypeNone, controller().textInputType());
 
   document().getElementById("b")->focus();
   EXPECT_EQ(WebTextInputTypeTelephone, controller().textInputType());
 
   controller().finishComposingText(InputMethodController::KeepSelection);
   EXPECT_EQ(WebTextInputTypeTelephone, controller().textInputType());
 }
 
+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));
+
+  controller().commitText(String("underlined"), underlines, 0);
+
+  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));
+
+  controller().commitText(String("string"), underlines, 0);
+
+  EXPECT_EQ(9u, document().markers().markers()[0]->startOffset());
+  EXPECT_EQ(15u, document().markers().markers()[0]->endOffset());
+}
+
 }  // namespace blink