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

Unified Diff: third_party/WebKit/Source/core/dom/TreeScopeTest.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/dom/TreeScopeTest.cpp
diff --git a/third_party/WebKit/Source/core/dom/TreeScopeTest.cpp b/third_party/WebKit/Source/core/dom/TreeScopeTest.cpp
index 180c495b08086ba78441a6af7eb0bfbcd6a02295..7ed3de9bc8550a26515ff853d56988c6b8449671 100644
--- a/third_party/WebKit/Source/core/dom/TreeScopeTest.cpp
+++ b/third_party/WebKit/Source/core/dom/TreeScopeTest.cpp
@@ -13,12 +13,12 @@ namespace blink {
TEST(TreeScopeTest, CommonAncestorOfSameTrees)
{
- RefPtrWillBeRawPtr<Document> document = Document::create();
+ RawPtr<Document> document = Document::create();
EXPECT_EQ(document.get(), document->commonAncestorTreeScope(*document));
- RefPtrWillBeRawPtr<Element> html = document->createElement("html", nullAtom, ASSERT_NO_EXCEPTION);
+ RawPtr<Element> html = document->createElement("html", nullAtom, ASSERT_NO_EXCEPTION);
document->appendChild(html, ASSERT_NO_EXCEPTION);
- RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = html->createShadowRootInternal(ShadowRootType::V0, ASSERT_NO_EXCEPTION);
+ RawPtr<ShadowRoot> shadowRoot = html->createShadowRootInternal(ShadowRootType::V0, ASSERT_NO_EXCEPTION);
EXPECT_EQ(shadowRoot.get(), shadowRoot->commonAncestorTreeScope(*shadowRoot));
}
@@ -28,10 +28,10 @@ TEST(TreeScopeTest, CommonAncestorOfInclusiveTrees)
// | : Common ancestor is document.
// shadowRoot
- RefPtrWillBeRawPtr<Document> document = Document::create();
- RefPtrWillBeRawPtr<Element> html = document->createElement("html", nullAtom, ASSERT_NO_EXCEPTION);
+ RawPtr<Document> document = Document::create();
+ RawPtr<Element> html = document->createElement("html", nullAtom, ASSERT_NO_EXCEPTION);
document->appendChild(html, ASSERT_NO_EXCEPTION);
- RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = html->createShadowRootInternal(ShadowRootType::V0, ASSERT_NO_EXCEPTION);
+ RawPtr<ShadowRoot> shadowRoot = html->createShadowRootInternal(ShadowRootType::V0, ASSERT_NO_EXCEPTION);
EXPECT_EQ(document.get(), document->commonAncestorTreeScope(*shadowRoot));
EXPECT_EQ(document.get(), shadowRoot->commonAncestorTreeScope(*document));
@@ -43,16 +43,16 @@ TEST(TreeScopeTest, CommonAncestorOfSiblingTrees)
// / \ : Common ancestor is document.
// A B
- RefPtrWillBeRawPtr<Document> document = Document::create();
- RefPtrWillBeRawPtr<Element> html = document->createElement("html", nullAtom, ASSERT_NO_EXCEPTION);
+ RawPtr<Document> document = Document::create();
+ RawPtr<Element> html = document->createElement("html", nullAtom, ASSERT_NO_EXCEPTION);
document->appendChild(html, ASSERT_NO_EXCEPTION);
- RefPtrWillBeRawPtr<Element> head = document->createElement("head", nullAtom, ASSERT_NO_EXCEPTION);
+ RawPtr<Element> head = document->createElement("head", nullAtom, ASSERT_NO_EXCEPTION);
html->appendChild(head);
- RefPtrWillBeRawPtr<Element> body = document->createElement("body", nullAtom, ASSERT_NO_EXCEPTION);
+ RawPtr<Element> body = document->createElement("body", nullAtom, ASSERT_NO_EXCEPTION);
html->appendChild(body);
- RefPtrWillBeRawPtr<ShadowRoot> shadowRootA = head->createShadowRootInternal(ShadowRootType::V0, ASSERT_NO_EXCEPTION);
- RefPtrWillBeRawPtr<ShadowRoot> shadowRootB = body->createShadowRootInternal(ShadowRootType::V0, ASSERT_NO_EXCEPTION);
+ RawPtr<ShadowRoot> shadowRootA = head->createShadowRootInternal(ShadowRootType::V0, ASSERT_NO_EXCEPTION);
+ RawPtr<ShadowRoot> shadowRootB = body->createShadowRootInternal(ShadowRootType::V0, ASSERT_NO_EXCEPTION);
EXPECT_EQ(document.get(), shadowRootA->commonAncestorTreeScope(*shadowRootB));
EXPECT_EQ(document.get(), shadowRootB->commonAncestorTreeScope(*shadowRootA));
@@ -66,20 +66,20 @@ TEST(TreeScopeTest, CommonAncestorOfTreesAtDifferentDepths)
// /
// A
- RefPtrWillBeRawPtr<Document> document = Document::create();
- RefPtrWillBeRawPtr<Element> html = document->createElement("html", nullAtom, ASSERT_NO_EXCEPTION);
+ RawPtr<Document> document = Document::create();
+ RawPtr<Element> html = document->createElement("html", nullAtom, ASSERT_NO_EXCEPTION);
document->appendChild(html, ASSERT_NO_EXCEPTION);
- RefPtrWillBeRawPtr<Element> head = document->createElement("head", nullAtom, ASSERT_NO_EXCEPTION);
+ RawPtr<Element> head = document->createElement("head", nullAtom, ASSERT_NO_EXCEPTION);
html->appendChild(head);
- RefPtrWillBeRawPtr<Element> body = document->createElement("body", nullAtom, ASSERT_NO_EXCEPTION);
+ RawPtr<Element> body = document->createElement("body", nullAtom, ASSERT_NO_EXCEPTION);
html->appendChild(body);
- RefPtrWillBeRawPtr<ShadowRoot> shadowRootY = head->createShadowRootInternal(ShadowRootType::V0, ASSERT_NO_EXCEPTION);
- RefPtrWillBeRawPtr<ShadowRoot> shadowRootB = body->createShadowRootInternal(ShadowRootType::V0, ASSERT_NO_EXCEPTION);
+ RawPtr<ShadowRoot> shadowRootY = head->createShadowRootInternal(ShadowRootType::V0, ASSERT_NO_EXCEPTION);
+ RawPtr<ShadowRoot> shadowRootB = body->createShadowRootInternal(ShadowRootType::V0, ASSERT_NO_EXCEPTION);
- RefPtrWillBeRawPtr<Element> divInY = document->createElement("div", nullAtom, ASSERT_NO_EXCEPTION);
+ RawPtr<Element> divInY = document->createElement("div", nullAtom, ASSERT_NO_EXCEPTION);
shadowRootY->appendChild(divInY);
- RefPtrWillBeRawPtr<ShadowRoot> shadowRootA = divInY->createShadowRootInternal(ShadowRootType::V0, ASSERT_NO_EXCEPTION);
+ RawPtr<ShadowRoot> shadowRootA = divInY->createShadowRootInternal(ShadowRootType::V0, ASSERT_NO_EXCEPTION);
EXPECT_EQ(document.get(), shadowRootA->commonAncestorTreeScope(*shadowRootB));
EXPECT_EQ(document.get(), shadowRootB->commonAncestorTreeScope(*shadowRootA));
@@ -87,8 +87,8 @@ TEST(TreeScopeTest, CommonAncestorOfTreesAtDifferentDepths)
TEST(TreeScopeTest, CommonAncestorOfTreesInDifferentDocuments)
{
- RefPtrWillBeRawPtr<Document> document1 = Document::create();
- RefPtrWillBeRawPtr<Document> document2 = Document::create();
+ RawPtr<Document> document1 = Document::create();
+ RawPtr<Document> document2 = Document::create();
EXPECT_EQ(0, document1->commonAncestorTreeScope(*document2));
EXPECT_EQ(0, document2->commonAncestorTreeScope(*document1));
}

Powered by Google App Engine
This is Rietveld 408576698