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

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 233 matching lines @@
 
     // No DOM update after 'compositionend'.
     dispatchCompositionEndEvent(frame(), composing);
 
     return result;
   }
 
   return replaceCompositionAndMoveCaret(composingText(), 0);
 }
 
-bool InputMethodController::commitText(const String& text,
-                                       int relativeCaretPosition) {
+bool InputMethodController::commitText(
+    const String& text,
+    const Vector<CompositionUnderline>& underlines,
+    int relativeCaretPosition) {
   if (hasComposition())
     return replaceCompositionAndMoveCaret(text, relativeCaretPosition);
 
   // We should do nothing in this case, because:
   // 1. No need to insert text when text is empty.
   // 2. Shouldn't move caret when relativeCaretPosition == 0 to avoid
   // duplicate selection change event.
   if (!text.length() && !relativeCaretPosition)
     return false;
-  return insertTextAndMoveCaret(text, relativeCaretPosition);
+
+  if (!insertTextAndMoveCaret(text, relativeCaretPosition))
+    return false;
+
+  Position base = mostForwardCaretPosition(frame().selection().base());
+  Node* baseNode = base.anchorNode();
+
+  if (!baseNode || !baseNode->isTextNode())
+    return true;
+
+  unsigned baseOffset = base.computeOffsetInContainerNode();
+
+  for (const auto& underline : underlines) {
+    unsigned underlineStart = baseOffset + underline.startOffset();
+    unsigned underlineEnd = baseOffset + underline.endOffset();
+
+    EphemeralRange ephemeralLineRange = EphemeralRange(
+        Position(baseNode, underlineStart), Position(baseNode, underlineEnd));
+    if (ephemeralLineRange.isNull())
+      continue;
+    document().markers().addCompositionMarker(
+        ephemeralLineRange.startPosition(), ephemeralLineRange.endPosition(),
+        underline.color(), underline.thick(), underline.backgroundColor());
+  }
+
+  return true;
 }
 
 bool InputMethodController::replaceComposition(const String& text) {
   if (!hasComposition())
     return false;
 
   // If the composition was set from existing text and didn't change, then
   // there's nothing to do here (and we should avoid doing anything as that
   // may clobber multi-node styled text).
   if (!m_isDirty && composingText() == text) {
@@ skipping 923 matching lines @@
   frame().chromeClient().resetInputMethod();
 }
 
 DEFINE_TRACE(InputMethodController) {
   visitor->trace(m_frame);
   visitor->trace(m_compositionRange);
   SynchronousMutationObserver::trace(visitor);
 }
 
 }  // namespace blink