Add support for persisting CompositionUnderlines in InputMethodController

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 328 matching lines @@
     unsigned underlineEnd = offset + underline.endOffset();
 
     EphemeralRange ephemeralLineRange =
         PlainTextRange(underlineStart, underlineEnd)
             .createRange(*rootEditableElement);
     if (ephemeralLineRange.isNull())
       continue;
 
     document().markers().addCompositionMarker(
         ephemeralLineRange.startPosition(), ephemeralLineRange.endPosition(),
-        underline.color(), underline.thick(), underline.backgroundColor());
+        underline.color(), underline.thick(), underline.backgroundColor(),
+        underline.persist());
   }
 }
 
 bool InputMethodController::replaceCompositionAndMoveCaret(
     const String& text,
     int relativeCaretPosition,
     const Vector<CompositionUnderline>& underlines) {
   Element* rootEditableElement = frame().selection().rootEditableElement();
   if (!rootEditableElement)
     return false;
@@ skipping 244 matching lines @@
   // needs to be audited. see http://crbug.com/590369 for more details.
   document().updateStyleAndLayoutIgnorePendingStylesheets();
 
   // We shouldn't close typing in the middle of setComposition.
   setEditableSelectionOffsets(selectedRange, NotUserTriggered);
 
   if (underlines.isEmpty()) {
     document().markers().addCompositionMarker(
         m_compositionRange->startPosition(), m_compositionRange->endPosition(),
         Color::black, false,
-        LayoutTheme::theme().platformDefaultCompositionBackgroundColor());
+        LayoutTheme::theme().platformDefaultCompositionBackgroundColor(),
+        false);
     return;
   }
 
   // Can't use addCompositionUnderlines here because the ranges are constructed
   // differently
   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());
+        underline.color(), underline.thick(), underline.backgroundColor(),
+        underline.persist());
   }
 }
 
 PlainTextRange InputMethodController::createSelectionRangeForSetComposition(
     int selectionStart,
     int selectionEnd,
     size_t textLength) const {
   const int selectionOffsetsStart =
       static_cast<int>(getSelectionOffsets().start());
   const int start = selectionOffsetsStart + selectionStart;
@@ skipping 452 matching lines @@
   frame().chromeClient().resetInputMethod();
 }
 
 DEFINE_TRACE(InputMethodController) {
   visitor->trace(m_frame);
   visitor->trace(m_compositionRange);
   SynchronousMutationObserver::trace(visitor);
 }
 
 }  // namespace blink