| Index: third_party/WebKit/Source/web/WebRange.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebRange.cpp b/third_party/WebKit/Source/web/WebRange.cpp
|
| index b659375b30dd94bffb3c15cca2be0f49bb16b8b9..a877e8a4e2f9d2182cf367ed57683574b9689acd 100644
|
| --- a/third_party/WebKit/Source/web/WebRange.cpp
|
| +++ b/third_party/WebKit/Source/web/WebRange.cpp
|
| @@ -45,21 +45,21 @@ WebRange::WebRange(int start, int length)
|
| DCHECK(start != -1 && length != 0) << "These values are reserved to indicate that the range is null";
|
| }
|
|
|
| -WebRange::WebRange(Range* range)
|
| +WebRange::WebRange(const EphemeralRange& range)
|
| {
|
| - if (!range)
|
| + if (range.isNull())
|
| return;
|
|
|
| - m_start = range->startOffset();
|
| - m_end = range->endOffset();
|
| + m_start = range.startPosition().computeOffsetInContainerNode();
|
| + m_end =range.endPosition().computeOffsetInContainerNode();
|
| }
|
|
|
| -Range* WebRange::createRange(LocalFrame* frame) const
|
| +EphemeralRange WebRange::createEphemeralRange(LocalFrame* frame) const
|
| {
|
| Element* selectionRoot = frame->selection().rootEditableElement();
|
| ContainerNode* scope = selectionRoot ? selectionRoot : frame->document()->documentElement();
|
|
|
| - return blink::createRange(PlainTextRange(m_start, m_end).createRange(*scope));
|
| + return PlainTextRange(m_start, m_end).createRange(*scope);
|
| }
|
|
|
| } // namespace blink
|
|
|