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

content/browser/renderer_host/ime_adapter_android.h

Index: content/browser/renderer_host/ime_adapter_android.h
diff --git a/content/browser/renderer_host/ime_adapter_android.h b/content/browser/renderer_host/ime_adapter_android.h
index c7f869d6dd8c12f6555d8b878946256bd8de234a..57610c06644b5f6dd98a6133c485929ecdcf263a 100644
--- a/content/browser/renderer_host/ime_adapter_android.h
+++ b/content/browser/renderer_host/ime_adapter_android.h
@@ -10,8 +10,15 @@
 #include <vector>
 
 #include "base/android/jni_weak_ref.h"
+#include "base/strings/string16.h"
 #include "ui/gfx/geometry/rect_f.h"
 
+namespace blink {
+
+struct WebCompositionUnderline;
+
+}  // namespace blink
+
 namespace content {
 
 class RenderFrameHost;
@@ -41,13 +48,14 @@ class ImeAdapterAndroid {
       int scan_code,
       bool is_system_key,
       int unicode_text);
-  void SetComposingText(JNIEnv*,
+  void SetComposingText(JNIEnv* env,
                         const base::android::JavaParamRef<jobject>& obj,
                         const base::android::JavaParamRef<jobject>& text,
                         const base::android::JavaParamRef<jstring>& text_str,
                         int relative_cursor_pos);
-  void CommitText(JNIEnv*,
-                  const base::android::JavaParamRef<jobject>&,
+  void CommitText(JNIEnv* env,
+                  const base::android::JavaParamRef<jobject>& obj,
+                  const base::android::JavaParamRef<jobject>& text,
                   const base::android::JavaParamRef<jstring>& text_str,
                   int relative_cursor_pos);
   void FinishComposingText(JNIEnv* env,
@@ -82,6 +90,11 @@ class ImeAdapterAndroid {
   RenderWidgetHostImpl* GetRenderWidgetHostImpl();
   RenderFrameHost* GetFocusedFrame();
   WebContents* GetWebContents();
+  std::vector<blink::WebCompositionUnderline> GetUnderlinesFromSpans(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& obj,
+      const base::android::JavaParamRef<jobject>& text,
+      const base::string16& text16);
 
   RenderWidgetHostViewAndroid* rwhva_;
   JavaObjectWeakGlobalRef java_ime_adapter_;