| Index: third_party/WebKit/Source/core/dom/RangeTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/dom/RangeTest.cpp b/third_party/WebKit/Source/core/dom/RangeTest.cpp
|
| index 077ee22132887fcbaa4fe2455f2e3bbd4fad6f46..cb96638b2c4f851495f5d60a46f38377063e61fc 100644
|
| --- a/third_party/WebKit/Source/core/dom/RangeTest.cpp
|
| +++ b/third_party/WebKit/Source/core/dom/RangeTest.cpp
|
| @@ -27,13 +27,13 @@ protected:
|
| HTMLDocument& document() const;
|
|
|
| private:
|
| - RefPtrWillBePersistent<HTMLDocument> m_document;
|
| + Persistent<HTMLDocument> m_document;
|
| };
|
|
|
| void RangeTest::SetUp()
|
| {
|
| m_document = HTMLDocument::create();
|
| - RefPtrWillBeRawPtr<HTMLHtmlElement> html = HTMLHtmlElement::create(*m_document);
|
| + RawPtr<HTMLHtmlElement> html = HTMLHtmlElement::create(*m_document);
|
| html->appendChild(HTMLBodyElement::create(*m_document));
|
| m_document->appendChild(html.release());
|
| }
|
| @@ -48,10 +48,10 @@ TEST_F(RangeTest, SplitTextNodeRangeWithinText)
|
| document().body()->setInnerHTML("1234", ASSERT_NO_EXCEPTION);
|
| Text* oldText = toText(document().body()->firstChild());
|
|
|
| - RefPtrWillBeRawPtr<Range> range04 = Range::create(document(), oldText, 0, oldText, 4);
|
| - RefPtrWillBeRawPtr<Range> range02 = Range::create(document(), oldText, 0, oldText, 2);
|
| - RefPtrWillBeRawPtr<Range> range22 = Range::create(document(), oldText, 2, oldText, 2);
|
| - RefPtrWillBeRawPtr<Range> range24 = Range::create(document(), oldText, 2, oldText, 4);
|
| + RawPtr<Range> range04 = Range::create(document(), oldText, 0, oldText, 4);
|
| + RawPtr<Range> range02 = Range::create(document(), oldText, 0, oldText, 2);
|
| + RawPtr<Range> range22 = Range::create(document(), oldText, 2, oldText, 2);
|
| + RawPtr<Range> range24 = Range::create(document(), oldText, 2, oldText, 4);
|
|
|
| oldText->splitText(2, ASSERT_NO_EXCEPTION);
|
| Text* newText = toText(oldText->nextSibling());
|
| @@ -91,12 +91,12 @@ TEST_F(RangeTest, SplitTextNodeRangeOutsideText)
|
| Element* innerRight = document().getElementById(AtomicString::fromUTF8("inner-right"));
|
| Text* oldText = toText(outer->childNodes()->item(2));
|
|
|
| - RefPtrWillBeRawPtr<Range> rangeOuterOutside = Range::create(document(), outer, 0, outer, 5);
|
| - RefPtrWillBeRawPtr<Range> rangeOuterInside = Range::create(document(), outer, 1, outer, 4);
|
| - RefPtrWillBeRawPtr<Range> rangeOuterSurroundingText = Range::create(document(), outer, 2, outer, 3);
|
| - RefPtrWillBeRawPtr<Range> rangeInnerLeft = Range::create(document(), innerLeft, 0, innerLeft, 1);
|
| - RefPtrWillBeRawPtr<Range> rangeInnerRight = Range::create(document(), innerRight, 0, innerRight, 1);
|
| - RefPtrWillBeRawPtr<Range> rangeFromTextToMiddleOfElement = Range::create(document(), oldText, 6, outer, 3);
|
| + RawPtr<Range> rangeOuterOutside = Range::create(document(), outer, 0, outer, 5);
|
| + RawPtr<Range> rangeOuterInside = Range::create(document(), outer, 1, outer, 4);
|
| + RawPtr<Range> rangeOuterSurroundingText = Range::create(document(), outer, 2, outer, 3);
|
| + RawPtr<Range> rangeInnerLeft = Range::create(document(), innerLeft, 0, innerLeft, 1);
|
| + RawPtr<Range> rangeInnerRight = Range::create(document(), innerRight, 0, innerRight, 1);
|
| + RawPtr<Range> rangeFromTextToMiddleOfElement = Range::create(document(), oldText, 6, outer, 3);
|
|
|
| oldText->splitText(3, ASSERT_NO_EXCEPTION);
|
| Text* newText = toText(oldText->nextSibling());
|
|
|