Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(302)

Unified Diff: third_party/WebKit/Source/core/editing/iterators/TextIteratorTest.cpp

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/editing/iterators/TextIteratorTest.cpp
diff --git a/third_party/WebKit/Source/core/editing/iterators/TextIteratorTest.cpp b/third_party/WebKit/Source/core/editing/iterators/TextIteratorTest.cpp
index 0587b2dbf673f1a95299a32a01f4fe995805d344..8fbb9186e27230869003f74a88baa529520231d8 100644
--- a/third_party/WebKit/Source/core/editing/iterators/TextIteratorTest.cpp
+++ b/third_party/WebKit/Source/core/editing/iterators/TextIteratorTest.cpp
@@ -53,7 +53,7 @@ protected:
template <typename Tree>
std::string iteratePartial(const typename Tree::PositionType& start, const typename Tree::PositionType& end, TextIteratorBehavior = TextIteratorDefaultBehavior);
- PassRefPtrWillBeRawPtr<Range> getBodyRange() const;
+ RawPtr<Range> getBodyRange() const;
private:
template <typename Tree>
@@ -63,7 +63,7 @@ private:
template <typename Tree>
std::string TextIteratorTest::iterate(TextIteratorBehavior iteratorBehavior)
{
- RefPtrWillBeRawPtr<Element> body = document().body();
+ RawPtr<Element> body = document().body();
using PositionType = typename Tree::PositionType;
auto start = PositionType(body, 0);
auto end = PositionType(body, Tree::countChildren(*body));
@@ -90,9 +90,9 @@ std::string TextIteratorTest::iterateWithIterator(typename Tree::TextIteratorTyp
return std::string(textChunks.utf8().data());
}
-PassRefPtrWillBeRawPtr<Range> TextIteratorTest::getBodyRange() const
+RawPtr<Range> TextIteratorTest::getBodyRange() const
{
- RefPtrWillBeRawPtr<Range> range(Range::create(document()));
+ RawPtr<Range> range(Range::create(document()));
range->selectNode(document().body());
return range.release();
}
@@ -200,7 +200,7 @@ TEST_F(TextIteratorTest, NotEnteringShadowTreeWithNestedShadowTrees)
static const char* shadowContent1 = "<span>first <span id='host-in-shadow'>shadow</span></span>";
static const char* shadowContent2 = "<span>second shadow</span>";
setBodyContent(bodyContent);
- RefPtrWillBeRawPtr<ShadowRoot> shadowRoot1 = createShadowRootForElementWithIDAndSetInnerHTML(document(), "host-in-document", shadowContent1);
+ RawPtr<ShadowRoot> shadowRoot1 = createShadowRootForElementWithIDAndSetInnerHTML(document(), "host-in-document", shadowContent1);
createShadowRootForElementWithIDAndSetInnerHTML(*shadowRoot1, "host-in-shadow", shadowContent2);
EXPECT_EQ("[Hello, ][ iterator.]", iterate<DOMTree>());
EXPECT_EQ("[Hello, ][first ][second shadow][ iterator.]", iterate<FlatTree>());
@@ -247,7 +247,7 @@ TEST_F(TextIteratorTest, EnteringShadowTreeWithNestedShadowTreesWithOption)
static const char* shadowContent1 = "<span>first <span id='host-in-shadow'>shadow</span></span>";
static const char* shadowContent2 = "<span>second shadow</span>";
setBodyContent(bodyContent);
- RefPtrWillBeRawPtr<ShadowRoot> shadowRoot1 = createShadowRootForElementWithIDAndSetInnerHTML(document(), "host-in-document", shadowContent1);
+ RawPtr<ShadowRoot> shadowRoot1 = createShadowRootForElementWithIDAndSetInnerHTML(document(), "host-in-document", shadowContent1);
createShadowRootForElementWithIDAndSetInnerHTML(*shadowRoot1, "host-in-shadow", shadowContent2);
EXPECT_EQ("[Hello, ][first ][second shadow][ iterator.]", iterate<DOMTree>(TextIteratorEntersOpenShadowRoots));
EXPECT_EQ("[Hello, ][first ][second shadow][ iterator.]", iterate<FlatTree>(TextIteratorEntersOpenShadowRoots));
@@ -271,7 +271,7 @@ TEST_F(TextIteratorTest, StartingAtNodeInShadowRoot)
static const char* bodyContent = "<div id='outer'>Hello, <span id='host'>text</span> iterator.</div>";
static const char* shadowContent = "<span><content>content</content> shadow</span>";
setBodyContent(bodyContent);
- RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = createShadowRootForElementWithIDAndSetInnerHTML(document(), "host", shadowContent);
+ RawPtr<ShadowRoot> shadowRoot = createShadowRootForElementWithIDAndSetInnerHTML(document(), "host", shadowContent);
Node* outerDiv = document().getElementById("outer");
Node* spanInShadow = shadowRoot->firstChild();
Position start(spanInShadow, PositionAnchorType::BeforeChildren);
@@ -288,7 +288,7 @@ TEST_F(TextIteratorTest, FinishingAtNodeInShadowRoot)
static const char* bodyContent = "<div id='outer'>Hello, <span id='host'>text</span> iterator.</div>";
static const char* shadowContent = "<span><content>content</content> shadow</span>";
setBodyContent(bodyContent);
- RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = createShadowRootForElementWithIDAndSetInnerHTML(document(), "host", shadowContent);
+ RawPtr<ShadowRoot> shadowRoot = createShadowRootForElementWithIDAndSetInnerHTML(document(), "host", shadowContent);
Node* outerDiv = document().getElementById("outer");
Node* spanInShadow = shadowRoot->firstChild();
Position start(outerDiv, PositionAnchorType::BeforeChildren);
@@ -381,7 +381,7 @@ TEST_F(TextIteratorTest, RangeLengthWithReplacedElements)
document().view()->updateAllLifecyclePhases();
Node* divNode = document().getElementById("div");
- RefPtrWillBeRawPtr<Range> range = Range::create(document(), divNode, 0, divNode, 3);
+ RawPtr<Range> range = Range::create(document(), divNode, 0, divNode, 3);
EXPECT_EQ(3, TextIterator::rangeLength(range->startPosition(), range->endPosition()));
}

Powered by Google App Engine
This is Rietveld 408576698