[WIP] Change DocumentMarkerController::add*Marker() methods to take an EphemeralRange

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 426 matching lines @@
   for (const auto& underline : underlines) {
     unsigned underlineStart = offsetInPlainChars + underline.startOffset();
     unsigned underlineEnd = offsetInPlainChars + underline.endOffset();
 
     EphemeralRange ephemeralLineRange =
         PlainTextRange(underlineStart, underlineEnd).createRange(*baseElement);
     if (ephemeralLineRange.isNull())
       continue;
 
     document().markers().addCompositionMarker(
-        ephemeralLineRange.startPosition(), ephemeralLineRange.endPosition(),
-        underline.color(), underline.thick(), underline.backgroundColor());
+        ephemeralLineRange, underline.color(), underline.thick(),
+        underline.backgroundColor());
   }
 }
 
 bool InputMethodController::replaceCompositionAndMoveCaret(
     const String& text,
     int relativeCaretPosition,
     const Vector<CompositionUnderline>& underlines) {
   Element* rootEditableElement =
       frame()
           .selection()
@@ skipping 225 matching lines @@
 
   // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // 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,
+        EphemeralRange(m_compositionRange), Color::black, false,
         LayoutTheme::theme().platformDefaultCompositionBackgroundColor());
     return;
   }
 
   const PlainTextRange compositionPlainTextRange =
       PlainTextRange::create(*baseNode->parentNode(), *m_compositionRange);
   addCompositionUnderlines(underlines, baseNode->parentNode(),
                            compositionPlainTextRange.start());
 }
 
@@ skipping 536 matching lines @@
   finishComposingText(KeepSelection);
 }
 
 DEFINE_TRACE(InputMethodController) {
   visitor->trace(m_frame);
   visitor->trace(m_compositionRange);
   SynchronousMutationObserver::trace(visitor);
 }
 
 }  // namespace blink