Change DocumentMarkerController::AddCompositionMarker() to take 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 447 matching lines @@
     unsigned underline_start = offset_in_plain_chars + underline.StartOffset();
     unsigned underline_end = offset_in_plain_chars + underline.EndOffset();
 
     EphemeralRange ephemeral_line_range =
         PlainTextRange(underline_start, underline_end)
             .CreateRange(*base_element);
     if (ephemeral_line_range.IsNull())
       continue;
 
     GetDocument().Markers().AddCompositionMarker(
-        ephemeral_line_range.StartPosition(),
-        ephemeral_line_range.EndPosition(), underline.GetColor(),
-        underline.Thick(), underline.BackgroundColor());
+        ephemeral_line_range, underline.GetColor(), underline.Thick(),
+        underline.BackgroundColor());
   }
 }
 
 bool InputMethodController::ReplaceCompositionAndMoveCaret(
     const String& text,
     int relative_caret_position,
     const Vector<CompositionUnderline>& underlines) {
   Element* root_editable_element =
       GetFrame()
           .Selection()
@@ skipping 202 matching lines @@
 
   // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited. see http://crbug.com/590369 for more details.
   GetDocument().UpdateStyleAndLayoutIgnorePendingStylesheets();
 
   // We shouldn't close typing in the middle of setComposition.
   SetEditableSelectionOffsets(selected_range, kNotUserTriggered);
 
   if (underlines.IsEmpty()) {
     GetDocument().Markers().AddCompositionMarker(
-        composition_range_->StartPosition(), composition_range_->EndPosition(),
-        Color::kBlack, false,
+        EphemeralRange(composition_range_), Color::kBlack, false,
         LayoutTheme::GetTheme().PlatformDefaultCompositionBackgroundColor());
     return;
   }
 
   const PlainTextRange composition_plain_text_range =
       PlainTextRange::Create(*base_node->parentNode(), *composition_range_);
   AddCompositionUnderlines(underlines, base_node->parentNode(),
                            composition_plain_text_range.Start());
 }
 
@@ skipping 532 matching lines @@
   FinishComposingText(kKeepSelection);
 }
 
 DEFINE_TRACE(InputMethodController) {
   visitor->Trace(frame_);
   visitor->Trace(composition_range_);
   SynchronousMutationObserver::Trace(visitor);
 }
 
 }  // namespace blink