Adapt WebRange to only deal with EphemeralRanges.

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 964 matching lines @@
     frame()->inputMethodController().cancelComposition();
 }
 
 bool WebLocalFrameImpl::hasMarkedText() const
 {
     return frame()->inputMethodController().hasComposition();
 }
 
 WebRange WebLocalFrameImpl::markedRange() const
 {
-    return frame()->inputMethodController().compositionRange();
+    return frame()->inputMethodController().compositionEphemeralRange();
 }
 
 bool WebLocalFrameImpl::firstRectForCharacterRange(unsigned location, unsigned length, WebRect& rectInViewport) const
 {
     if ((location + length < location) && (location + length))
         length = 0;
 
     Element* editable = frame()->selection().rootEditableElementOrDocumentElement();
     if (!editable)
         return false;
@@ skipping 106 matching lines @@
     WebPluginContainerImpl* pluginContainer = pluginContainerFromFrame(frame());
     if (pluginContainer)
         return pluginContainer->plugin()->hasSelection();
 
     // frame()->selection()->isNone() never returns true.
     return frame()->selection().start() != frame()->selection().end();
 }
 
 WebRange WebLocalFrameImpl::selectionRange() const
 {
-    return createRange(frame()->selection().selection().toNormalizedEphemeralRange());
+    return frame()->selection().selection().toNormalizedEphemeralRange();
 }
 
 WebString WebLocalFrameImpl::selectionAsText() const
 {
     WebPluginContainerImpl* pluginContainer = pluginContainerFromFrame(frame());
     if (pluginContainer)
         return pluginContainer->plugin()->selectionAsText();
 
     String text = frame()->selection().selectedText(TextIteratorEmitsObjectReplacementCharacter);
 #if OS(WIN)
@@ skipping 35 matching lines @@
 void WebLocalFrameImpl::selectRange(const WebRange& webRange)
 {
     TRACE_EVENT0("blink", "WebLocalFrameImpl::selectRange");
 
     // TODO(dglazkov): The use of updateStyleAndLayoutIgnorePendingStylesheets needs to be audited.
     // see http://crbug.com/590369 for more details.
     frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
     DocumentLifecycle::DisallowTransitionScope(frame()->document()->lifecycle());
 
-    // TODO(dglazkov): Use EphemeralRange here.
-    // See http://crbug.com/636216 for more details.
-    if (Range* range = webRange.createRange(frame()))
-        frame()->selection().setSelectedRange(range, VP_DEFAULT_AFFINITY, SelectionDirectionalMode::NonDirectional, NotUserTriggered);
+    frame()->selection().setSelectedRange(webRange.createEphemeralRange(frame()), VP_DEFAULT_AFFINITY, SelectionDirectionalMode::NonDirectional, NotUserTriggered);
 }
 
 WebString WebLocalFrameImpl::rangeAsText(const WebRange& webRange)
 {
     // TODO(dglazkov): The use of updateStyleAndLayoutIgnorePendingStylesheets needs to be audited.
     // see http://crbug.com/590369 for more details.
     frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
     DocumentLifecycle::DisallowTransitionScope(frame()->document()->lifecycle());
 
-    // TODO(dglazkov): Use EphemeralRange here.
-    // See http://crbug.com/636216 for more details.
-    if (Range* range = webRange.createRange(frame()))
-        return range->text();
-
-    return WebString();
+    return plainText(webRange.createEphemeralRange(frame()), TextIteratorEmitsObjectReplacementCharacter);
 }
 
 void WebLocalFrameImpl::moveRangeSelectionExtent(const WebPoint& point)
 {
     TRACE_EVENT0("blink", "WebLocalFrameImpl::moveRangeSelectionExtent");
     frame()->selection().moveRangeSelectionExtent(frame()->view()->viewportToContents(point));
 }
 
 void WebLocalFrameImpl::moveRangeSelection(const WebPoint& baseInViewport, const WebPoint& extentInViewport, WebFrame::TextGranularity granularity)
 {
@@ skipping 1047 matching lines @@
         feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol;
     } else if (metric == "wasAlternateProtocolAvailable") {
         feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable;
     } else if (metric == "connectionInfo") {
         feature = UseCounter::ChromeLoadTimesConnectionInfo;
     }
     UseCounter::count(frame(), feature);
 }
 
 } // namespace blink