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

third_party/WebKit/Source/core/editing/InputMethodController.h

Index: third_party/WebKit/Source/core/editing/InputMethodController.h
diff --git a/third_party/WebKit/Source/core/editing/InputMethodController.h b/third_party/WebKit/Source/core/editing/InputMethodController.h
index 20ce266d8a3b86b055f5cf7f3a7ee873671cf8d2..59715cd6d165d0f04057a931261710e5cfa3c2cf 100644
--- a/third_party/WebKit/Source/core/editing/InputMethodController.h
+++ b/third_party/WebKit/Source/core/editing/InputMethodController.h
@@ -62,18 +62,20 @@ class CORE_EXPORT InputMethodController final
 
   // international text input composition
   bool hasComposition() const;
-  void setComposition(const String&,
-                      const Vector<CompositionUnderline>&,
+  void setComposition(const String& text,
+                      const Vector<CompositionUnderline>& underlines,
                       int selectionStart,
                       int selectionEnd);
-  void setCompositionFromExistingText(const Vector<CompositionUnderline>&,
+  void setCompositionFromExistingText(const Vector<CompositionUnderline>& text,
                                       unsigned compositionStart,
                                       unsigned compositionEnd);
 
   // Deletes ongoing composing text if any, inserts specified text, and
   // changes the selection according to relativeCaretPosition, which is
   // relative to the end of the inserting text.
-  bool commitText(const String& text, int relativeCaretPosition);
+  bool commitText(const String& text,
+                  const Vector<CompositionUnderline>& underlines,
+                  int relativeCaretPosition);
 
   // Inserts ongoing composing text; changes the selection to the end of
   // the inserting text if DoNotKeepSelection, or holds the selection if
@@ -128,15 +130,24 @@ class CORE_EXPORT InputMethodController final
       const PlainTextRange&,
       FrameSelection::SetSelectionOptions = FrameSelection::CloseTyping);
 
+  void addCompositionUnderlines(const Vector<CompositionUnderline>& underlines,
+                                Node* baseNode,
+                                unsigned baseOffset);
+
   bool insertText(const String&);
-  bool insertTextAndMoveCaret(const String&, int relativeCaretPosition);
+  bool insertTextAndMoveCaret(const String&,
+                              int relativeCaretPosition,
+                              const Vector<CompositionUnderline>& underlines);
 
   // Inserts the given text string in the place of the existing composition.
   // Returns true if did replace.
   bool replaceComposition(const String& text);
   // Inserts the given text string in the place of the existing composition
   // and moves caret. Returns true if did replace and moved caret successfully.
-  bool replaceCompositionAndMoveCaret(const String&, int relativeCaretPosition);
+  bool replaceCompositionAndMoveCaret(
+      const String&,
+      int relativeCaretPosition,
+      const Vector<CompositionUnderline>& underlines);
 
   // Returns true if moved caret successfully.
   bool moveCaret(int newCaretPosition);