| Index: third_party/WebKit/Source/core/editing/PositionTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/editing/PositionTest.cpp b/third_party/WebKit/Source/core/editing/PositionTest.cpp
|
| index 5eaa8072061eddd3acc8d2112ed4952ccc90ecaf..fd228e03015f8ce88bcc6ed9d2f1088392c3be96 100644
|
| --- a/third_party/WebKit/Source/core/editing/PositionTest.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/PositionTest.cpp
|
| @@ -73,7 +73,7 @@ TEST_F(PositionTest, NodeAsRangeLastNodeShadow)
|
| const char* bodyContent = "<p id='host'>00<b id='one'>11</b><b id='two'>22</b>33</p>";
|
| const char* shadowContent = "<a id='a'><content select=#two></content><content select=#one></content></a>";
|
| setBodyContent(bodyContent);
|
| - RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = setShadowContent(shadowContent, "host");
|
| + RawPtr<ShadowRoot> shadowRoot = setShadowContent(shadowContent, "host");
|
|
|
| Node* host = document().getElementById("host");
|
| Node* n1 = document().getElementById("one");
|
| @@ -102,8 +102,8 @@ TEST_F(PositionTest, ToPositionInFlatTreeWithActiveInsertionPoint)
|
| const char* bodyContent = "<p id='host'>00<b id='one'>11</b>22</p>";
|
| const char* shadowContent = "<a id='a'><content select=#one id='content'></content><content></content></a>";
|
| setBodyContent(bodyContent);
|
| - RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = setShadowContent(shadowContent, "host");
|
| - RefPtrWillBeRawPtr<Element> anchor = shadowRoot->getElementById("a");
|
| + RawPtr<ShadowRoot> shadowRoot = setShadowContent(shadowContent, "host");
|
| + RawPtr<Element> anchor = shadowRoot->getElementById("a");
|
|
|
| EXPECT_EQ(PositionInFlatTree(anchor.get(), 0), toPositionInFlatTree(Position(anchor.get(), 0)));
|
| EXPECT_EQ(PositionInFlatTree(anchor.get(), 1), toPositionInFlatTree(Position(anchor.get(), 1)));
|
| @@ -114,7 +114,7 @@ TEST_F(PositionTest, ToPositionInFlatTreeWithInactiveInsertionPoint)
|
| {
|
| const char* bodyContent = "<p id='p'><content></content></p>";
|
| setBodyContent(bodyContent);
|
| - RefPtrWillBeRawPtr<Element> anchor = document().getElementById("p");
|
| + RawPtr<Element> anchor = document().getElementById("p");
|
|
|
| EXPECT_EQ(PositionInFlatTree(anchor.get(), 0), toPositionInFlatTree(Position(anchor.get(), 0)));
|
| EXPECT_EQ(PositionInFlatTree(anchor, PositionAnchorType::AfterChildren), toPositionInFlatTree(Position(anchor.get(), 1)));
|
| @@ -134,8 +134,8 @@ TEST_F(PositionTest, ToPositionInFlatTreeWithShadowRoot)
|
| const char* bodyContent = "<p id='host'>00<b id='one'>11</b>22</p>";
|
| const char* shadowContent = "<a><content select=#one></content></a>";
|
| setBodyContent(bodyContent);
|
| - RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = setShadowContent(shadowContent, "host");
|
| - RefPtrWillBeRawPtr<Element> host = document().getElementById("host");
|
| + RawPtr<ShadowRoot> shadowRoot = setShadowContent(shadowContent, "host");
|
| + RawPtr<Element> host = document().getElementById("host");
|
|
|
| EXPECT_EQ(PositionInFlatTree(host.get(), 0), toPositionInFlatTree(Position(shadowRoot.get(), 0)));
|
| EXPECT_EQ(PositionInFlatTree(host.get(), PositionAnchorType::AfterChildren), toPositionInFlatTree(Position(shadowRoot.get(), 1)));
|
| @@ -146,8 +146,8 @@ TEST_F(PositionTest, ToPositionInFlatTreeWithShadowRootContainingSingleContent)
|
| const char* bodyContent = "<p id='host'>00<b id='one'>11</b>22</p>";
|
| const char* shadowContent = "<content select=#one></content>";
|
| setBodyContent(bodyContent);
|
| - RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = setShadowContent(shadowContent, "host");
|
| - RefPtrWillBeRawPtr<Element> host = document().getElementById("host");
|
| + RawPtr<ShadowRoot> shadowRoot = setShadowContent(shadowContent, "host");
|
| + RawPtr<Element> host = document().getElementById("host");
|
|
|
| EXPECT_EQ(PositionInFlatTree(host.get(), 0), toPositionInFlatTree(Position(shadowRoot.get(), 0)));
|
| EXPECT_EQ(PositionInFlatTree(host.get(), PositionAnchorType::AfterChildren), toPositionInFlatTree(Position(shadowRoot.get(), 1)));
|
| @@ -158,8 +158,8 @@ TEST_F(PositionTest, ToPositionInFlatTreeWithEmptyShadowRoot)
|
| const char* bodyContent = "<p id='host'>00<b id='one'>11</b>22</p>";
|
| const char* shadowContent = "";
|
| setBodyContent(bodyContent);
|
| - RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = setShadowContent(shadowContent, "host");
|
| - RefPtrWillBeRawPtr<Element> host = document().getElementById("host");
|
| + RawPtr<ShadowRoot> shadowRoot = setShadowContent(shadowContent, "host");
|
| + RawPtr<Element> host = document().getElementById("host");
|
|
|
| EXPECT_EQ(PositionInFlatTree(host, PositionAnchorType::AfterChildren), toPositionInFlatTree(Position(shadowRoot.get(), 0)));
|
| }
|
|
|