Adapt WebRange to only deal with EphemeralRanges.

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Index: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
index a2a1ce0a3a8a5648f6090052e0c8cbc42a8cb1f8..bfacc4a75516c3e1011567a31fdfae424b1c80bc 100644
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
@@ -982,7 +982,7 @@ bool WebLocalFrameImpl::hasMarkedText() const
 
 WebRange WebLocalFrameImpl::markedRange() const
 {
-    return frame()->inputMethodController().compositionRange();
+    return frame()->inputMethodController().compositionEphemeralRange();
 }
 
 bool WebLocalFrameImpl::firstRectForCharacterRange(unsigned location, unsigned length, WebRect& rectInViewport) const
@@ -1109,7 +1109,7 @@ bool WebLocalFrameImpl::hasSelection() const
 
 WebRange WebLocalFrameImpl::selectionRange() const
 {
-    return createRange(frame()->selection().selection().toNormalizedEphemeralRange());
+    return frame()->selection().selection().toNormalizedEphemeralRange();
 }
 
 WebString WebLocalFrameImpl::selectionAsText() const
@@ -1165,10 +1165,7 @@ void WebLocalFrameImpl::selectRange(const WebRange& webRange)
 
     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)
@@ -1179,12 +1176,7 @@ WebString WebLocalFrameImpl::rangeAsText(const WebRange& webRange)
 
     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)