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

third_party/WebKit/Source/web/WebInputMethodControllerImpl.cpp

 // Copyright 2016 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 "web/WebInputMethodControllerImpl.h"
 
 #include "core/InputTypeNames.h"
 #include "core/dom/DocumentUserGestureToken.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/Editor.h"
@@ skipping 97 matching lines @@
   // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
   return inputMethodController().finishComposingText(
       selectionBehavior == WebInputMethodController::KeepSelection
           ? InputMethodController::KeepSelection
           : InputMethodController::DoNotKeepSelection);
 }
 
-bool WebInputMethodControllerImpl::commitText(const WebString& text,
-                                              int relativeCaretPosition) {
+bool WebInputMethodControllerImpl::commitText(
+    const WebString& text,
+    const WebVector<WebCompositionUnderline>& underlines,
+    int relativeCaretPosition) {
   UserGestureIndicator gestureIndicator(DocumentUserGestureToken::create(
       frame()->document(), UserGestureToken::NewGesture));
 
   if (WebPlugin* plugin = focusedPluginIfInputMethodSupported())
-    return plugin->commitText(text, relativeCaretPosition);
+    return plugin->commitText(text, underlines, relativeCaretPosition);
 
   // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
-  return inputMethodController().commitText(text, relativeCaretPosition);
+  return inputMethodController().commitText(
+      text, CompositionUnderlineVectorBuilder(underlines),
+      relativeCaretPosition);
 }
 
 WebTextInputInfo WebInputMethodControllerImpl::textInputInfo() {
   return frame()->inputMethodController().textInputInfo();
 }
 
 WebTextInputType WebInputMethodControllerImpl::textInputType() {
   return frame()->inputMethodController().textInputType();
 }
 
 LocalFrame* WebInputMethodControllerImpl::frame() const {
   return m_webLocalFrame->frame();
 }
 
 InputMethodController& WebInputMethodControllerImpl::inputMethodController()
     const {
   return frame()->inputMethodController();
 }
 
 WebPlugin* WebInputMethodControllerImpl::focusedPluginIfInputMethodSupported()
     const {
   WebPluginContainerImpl* container =
       WebLocalFrameImpl::currentPluginContainer(frame());
   if (container && container->supportsInputMethod())
     return container->plugin();
   return nullptr;
 }
 
 }  // namespace blink