| Index: third_party/WebKit/Source/core/editing/DOMSelection.cpp
|
| diff --git a/third_party/WebKit/Source/core/editing/DOMSelection.cpp b/third_party/WebKit/Source/core/editing/DOMSelection.cpp
|
| index 56b7fb9e3a9a5dfa04dfc8a1ee13d880902b5a73..27cd215fe716607ca37b4b44533a735d84442dc5 100644
|
| --- a/third_party/WebKit/Source/core/editing/DOMSelection.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/DOMSelection.cpp
|
| @@ -220,7 +220,7 @@ void DOMSelection::collapse(Node* node, int offset, ExceptionState& exceptionSta
|
|
|
| if (!isValidForPosition(node))
|
| return;
|
| - RefPtrWillBeRawPtr<Range> range = Range::create(node->document());
|
| + RawPtr<Range> range = Range::create(node->document());
|
| range->setStart(node, offset, exceptionState);
|
| if (exceptionState.hadException())
|
| return;
|
| @@ -366,7 +366,7 @@ void DOMSelection::extend(Node* node, int offset, ExceptionState& exceptionState
|
| m_frame->selection().setExtent(createVisiblePosition(createPosition(node, offset)));
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<Range> DOMSelection::getRangeAt(int index, ExceptionState& exceptionState)
|
| +RawPtr<Range> DOMSelection::getRangeAt(int index, ExceptionState& exceptionState)
|
| {
|
| if (!m_frame)
|
| return nullptr;
|
| @@ -414,7 +414,7 @@ void DOMSelection::addRange(Range* newRange)
|
| return;
|
| }
|
|
|
| - RefPtrWillBeRawPtr<Range> originalRange = selection.firstRange();
|
| + RawPtr<Range> originalRange = selection.firstRange();
|
|
|
| if (originalRange->startContainer()->document() != newRange->startContainer()->document()) {
|
| addConsoleError("The given range does not belong to the current selection's document.");
|
| @@ -438,7 +438,7 @@ void DOMSelection::addRange(Range* newRange)
|
|
|
| Range* start = originalRange->compareBoundaryPoints(Range::START_TO_START, newRange, ASSERT_NO_EXCEPTION) < 0 ? originalRange.get() : newRange;
|
| Range* end = originalRange->compareBoundaryPoints(Range::END_TO_END, newRange, ASSERT_NO_EXCEPTION) < 0 ? newRange : originalRange.get();
|
| - RefPtrWillBeRawPtr<Range> merged = Range::create(originalRange->startContainer()->document(), start->startContainer(), start->startOffset(), end->endContainer(), end->endOffset());
|
| + RawPtr<Range> merged = Range::create(originalRange->startContainer()->document(), start->startContainer(), start->startOffset(), end->endContainer(), end->endOffset());
|
| TextAffinity affinity = selection.selection().affinity();
|
| selection.setSelectedRange(merged.get(), affinity);
|
| }
|
| @@ -453,7 +453,7 @@ void DOMSelection::deleteFromDocument()
|
| if (selection.isNone())
|
| return;
|
|
|
| - RefPtrWillBeRawPtr<Range> selectedRange = createRange(selection.selection().toNormalizedEphemeralRange());
|
| + RawPtr<Range> selectedRange = createRange(selection.selection().toNormalizedEphemeralRange());
|
| if (!selectedRange)
|
| return;
|
|
|
|
|