| Index: third_party/WebKit/Source/core/dom/shadow/FlatTreeTraversalTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/dom/shadow/FlatTreeTraversalTest.cpp b/third_party/WebKit/Source/core/dom/shadow/FlatTreeTraversalTest.cpp
|
| index 2bc828c953027c5eb9a02db1bdbecfe387c1deb5..3584d0a26ebed83f6e9b3edec1b4ba4087e5b6eb 100644
|
| --- a/third_party/WebKit/Source/core/dom/shadow/FlatTreeTraversalTest.cpp
|
| +++ b/third_party/WebKit/Source/core/dom/shadow/FlatTreeTraversalTest.cpp
|
| @@ -42,7 +42,7 @@ protected:
|
| private:
|
| void SetUp() override;
|
|
|
| - RefPtrWillBePersistent<HTMLDocument> m_document;
|
| + Persistent<HTMLDocument> m_document;
|
| OwnPtr<DummyPageHolder> m_dummyPageHolder;
|
| };
|
|
|
| @@ -60,30 +60,30 @@ HTMLDocument& FlatTreeTraversalTest::document() const
|
|
|
| void FlatTreeTraversalTest::setupSampleHTML(const char* mainHTML, const char* shadowHTML, unsigned index)
|
| {
|
| - RefPtrWillBeRawPtr<Element> body = document().body();
|
| + RawPtr<Element> body = document().body();
|
| body->setInnerHTML(String::fromUTF8(mainHTML), ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> shadowHost = toElement(NodeTraversal::childAt(*body, index));
|
| - RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = shadowHost->createShadowRootInternal(ShadowRootType::V0, ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> shadowHost = toElement(NodeTraversal::childAt(*body, index));
|
| + RawPtr<ShadowRoot> shadowRoot = shadowHost->createShadowRootInternal(ShadowRootType::V0, ASSERT_NO_EXCEPTION);
|
| shadowRoot->setInnerHTML(String::fromUTF8(shadowHTML), ASSERT_NO_EXCEPTION);
|
| body->updateDistribution();
|
| }
|
|
|
| void FlatTreeTraversalTest::setupDocumentTree(const char* mainHTML)
|
| {
|
| - RefPtrWillBeRawPtr<Element> body = document().body();
|
| + RawPtr<Element> body = document().body();
|
| body->setInnerHTML(String::fromUTF8(mainHTML), ASSERT_NO_EXCEPTION);
|
| }
|
|
|
| void FlatTreeTraversalTest::attachV0ShadowRoot(Element& shadowHost, const char* shadowInnerHTML)
|
| {
|
| - RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = shadowHost.createShadowRootInternal(ShadowRootType::V0, ASSERT_NO_EXCEPTION);
|
| + RawPtr<ShadowRoot> shadowRoot = shadowHost.createShadowRootInternal(ShadowRootType::V0, ASSERT_NO_EXCEPTION);
|
| shadowRoot->setInnerHTML(String::fromUTF8(shadowInnerHTML), ASSERT_NO_EXCEPTION);
|
| document().body()->updateDistribution();
|
| }
|
|
|
| void FlatTreeTraversalTest::attachOpenShadowRoot(Element& shadowHost, const char* shadowInnerHTML)
|
| {
|
| - RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = shadowHost.createShadowRootInternal(ShadowRootType::Open, ASSERT_NO_EXCEPTION);
|
| + RawPtr<ShadowRoot> shadowRoot = shadowHost.createShadowRootInternal(ShadowRootType::Open, ASSERT_NO_EXCEPTION);
|
| shadowRoot->setInnerHTML(String::fromUTF8(shadowInnerHTML), ASSERT_NO_EXCEPTION);
|
| document().body()->updateDistribution();
|
| }
|
| @@ -117,17 +117,17 @@ TEST_F(FlatTreeTraversalTest, childAt)
|
| "<a id='s04'>s04</a>";
|
| setupSampleHTML(mainHTML, shadowHTML, 0);
|
|
|
| - RefPtrWillBeRawPtr<Element> body = document().body();
|
| - RefPtrWillBeRawPtr<Element> m0 = body->querySelector("#m0", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> m00 = m0->querySelector("#m00", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> m01 = m0->querySelector("#m01", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> body = document().body();
|
| + RawPtr<Element> m0 = body->querySelector("#m0", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> m00 = m0->querySelector("#m00", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> m01 = m0->querySelector("#m01", ASSERT_NO_EXCEPTION);
|
|
|
| - RefPtrWillBeRawPtr<Element> shadowHost = m0;
|
| - RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = shadowHost->openShadowRoot();
|
| - RefPtrWillBeRawPtr<Element> s00 = shadowRoot->querySelector("#s00", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> s02 = shadowRoot->querySelector("#s02", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> s03 = shadowRoot->querySelector("#s03", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> s04 = shadowRoot->querySelector("#s04", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> shadowHost = m0;
|
| + RawPtr<ShadowRoot> shadowRoot = shadowHost->openShadowRoot();
|
| + RawPtr<Element> s00 = shadowRoot->querySelector("#s00", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> s02 = shadowRoot->querySelector("#s02", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> s03 = shadowRoot->querySelector("#s03", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> s04 = shadowRoot->querySelector("#s04", ASSERT_NO_EXCEPTION);
|
|
|
| const unsigned numberOfChildNodes = 5;
|
| Node* expectedChildNodes[5] = { s00.get(), m01.get(), s02.get(), s03.get(), s04.get() };
|
| @@ -192,25 +192,25 @@ TEST_F(FlatTreeTraversalTest, commonAncestor)
|
| "</a>"
|
| "<a id='s14'>s14</a>";
|
| setupSampleHTML(mainHTML, shadowHTML, 1);
|
| - RefPtrWillBeRawPtr<Element> body = document().body();
|
| - RefPtrWillBeRawPtr<Element> m0 = body->querySelector("#m0", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> m1 = body->querySelector("#m1", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> m2 = body->querySelector("#m2", ASSERT_NO_EXCEPTION);
|
| -
|
| - RefPtrWillBeRawPtr<Element> m00 = body->querySelector("#m00", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> m01 = body->querySelector("#m01", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> m10 = body->querySelector("#m10", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> m11 = body->querySelector("#m11", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> m12 = body->querySelector("#m12", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> m20 = body->querySelector("#m20", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> m21 = body->querySelector("#m21", ASSERT_NO_EXCEPTION);
|
| -
|
| - RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = m1->openShadowRoot();
|
| - RefPtrWillBeRawPtr<Element> s10 = shadowRoot->querySelector("#s10", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> s11 = shadowRoot->querySelector("#s11", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> s12 = shadowRoot->querySelector("#s12", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> s13 = shadowRoot->querySelector("#s13", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> s14 = shadowRoot->querySelector("#s14", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> body = document().body();
|
| + RawPtr<Element> m0 = body->querySelector("#m0", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> m1 = body->querySelector("#m1", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> m2 = body->querySelector("#m2", ASSERT_NO_EXCEPTION);
|
| +
|
| + RawPtr<Element> m00 = body->querySelector("#m00", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> m01 = body->querySelector("#m01", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> m10 = body->querySelector("#m10", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> m11 = body->querySelector("#m11", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> m12 = body->querySelector("#m12", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> m20 = body->querySelector("#m20", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> m21 = body->querySelector("#m21", ASSERT_NO_EXCEPTION);
|
| +
|
| + RawPtr<ShadowRoot> shadowRoot = m1->openShadowRoot();
|
| + RawPtr<Element> s10 = shadowRoot->querySelector("#s10", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> s11 = shadowRoot->querySelector("#s11", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> s12 = shadowRoot->querySelector("#s12", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> s13 = shadowRoot->querySelector("#s13", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> s14 = shadowRoot->querySelector("#s14", ASSERT_NO_EXCEPTION);
|
|
|
| testCommonAncestor(body.get(), *m0, *m1);
|
| testCommonAncestor(body.get(), *m1, *m2);
|
| @@ -263,18 +263,18 @@ TEST_F(FlatTreeTraversalTest, nextSkippingChildren)
|
| "</a>";
|
| setupSampleHTML(mainHTML, shadowHTML, 1);
|
|
|
| - RefPtrWillBeRawPtr<Element> body = document().body();
|
| - RefPtrWillBeRawPtr<Element> m0 = body->querySelector("#m0", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> m1 = body->querySelector("#m1", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> m2 = body->querySelector("#m2", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> body = document().body();
|
| + RawPtr<Element> m0 = body->querySelector("#m0", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> m1 = body->querySelector("#m1", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> m2 = body->querySelector("#m2", ASSERT_NO_EXCEPTION);
|
|
|
| - RefPtrWillBeRawPtr<Element> m10 = body->querySelector("#m10", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> m11 = body->querySelector("#m11", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> m10 = body->querySelector("#m10", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> m11 = body->querySelector("#m11", ASSERT_NO_EXCEPTION);
|
|
|
| - RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = m1->openShadowRoot();
|
| - RefPtrWillBeRawPtr<Element> s11 = shadowRoot->querySelector("#s11", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> s12 = shadowRoot->querySelector("#s12", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> s120 = shadowRoot->querySelector("#s120", ASSERT_NO_EXCEPTION);
|
| + RawPtr<ShadowRoot> shadowRoot = m1->openShadowRoot();
|
| + RawPtr<Element> s11 = shadowRoot->querySelector("#s11", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> s12 = shadowRoot->querySelector("#s12", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> s120 = shadowRoot->querySelector("#s120", ASSERT_NO_EXCEPTION);
|
|
|
| // Main tree node to main tree node
|
| EXPECT_EQ(*m1, FlatTreeTraversal::nextSkippingChildren(*m0));
|
| @@ -321,16 +321,16 @@ TEST_F(FlatTreeTraversalTest, lastWithin)
|
| "</a>";
|
| setupSampleHTML(mainHTML, shadowHTML, 1);
|
|
|
| - RefPtrWillBeRawPtr<Element> body = document().body();
|
| - RefPtrWillBeRawPtr<Element> m0 = body->querySelector("#m0", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> m1 = body->querySelector("#m1", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> m2 = body->querySelector("#m2", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> body = document().body();
|
| + RawPtr<Element> m0 = body->querySelector("#m0", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> m1 = body->querySelector("#m1", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> m2 = body->querySelector("#m2", ASSERT_NO_EXCEPTION);
|
|
|
| - RefPtrWillBeRawPtr<Element> m10 = body->querySelector("#m10", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> m10 = body->querySelector("#m10", ASSERT_NO_EXCEPTION);
|
|
|
| - RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = m1->openShadowRoot();
|
| - RefPtrWillBeRawPtr<Element> s11 = shadowRoot->querySelector("#s11", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> s12 = shadowRoot->querySelector("#s12", ASSERT_NO_EXCEPTION);
|
| + RawPtr<ShadowRoot> shadowRoot = m1->openShadowRoot();
|
| + RawPtr<Element> s11 = shadowRoot->querySelector("#s11", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> s12 = shadowRoot->querySelector("#s12", ASSERT_NO_EXCEPTION);
|
|
|
| EXPECT_EQ(m0->firstChild(), FlatTreeTraversal::lastWithin(*m0));
|
| EXPECT_EQ(*m0->firstChild(), FlatTreeTraversal::lastWithinOrSelf(*m0));
|
| @@ -366,18 +366,18 @@ TEST_F(FlatTreeTraversalTest, previousPostOrder)
|
| "</a>";
|
| setupSampleHTML(mainHTML, shadowHTML, 1);
|
|
|
| - RefPtrWillBeRawPtr<Element> body = document().body();
|
| - RefPtrWillBeRawPtr<Element> m0 = body->querySelector("#m0", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> m1 = body->querySelector("#m1", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> m2 = body->querySelector("#m2", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> body = document().body();
|
| + RawPtr<Element> m0 = body->querySelector("#m0", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> m1 = body->querySelector("#m1", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> m2 = body->querySelector("#m2", ASSERT_NO_EXCEPTION);
|
|
|
| - RefPtrWillBeRawPtr<Element> m10 = body->querySelector("#m10", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> m11 = body->querySelector("#m11", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> m10 = body->querySelector("#m10", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> m11 = body->querySelector("#m11", ASSERT_NO_EXCEPTION);
|
|
|
| - RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = m1->openShadowRoot();
|
| - RefPtrWillBeRawPtr<Element> s11 = shadowRoot->querySelector("#s11", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> s12 = shadowRoot->querySelector("#s12", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> s120 = shadowRoot->querySelector("#s120", ASSERT_NO_EXCEPTION);
|
| + RawPtr<ShadowRoot> shadowRoot = m1->openShadowRoot();
|
| + RawPtr<Element> s11 = shadowRoot->querySelector("#s11", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> s12 = shadowRoot->querySelector("#s12", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> s120 = shadowRoot->querySelector("#s120", ASSERT_NO_EXCEPTION);
|
|
|
| EXPECT_EQ(*m0->firstChild(), FlatTreeTraversal::previousPostOrder(*m0));
|
| EXPECT_EQ(*s12, FlatTreeTraversal::previousPostOrder(*m1));
|
| @@ -409,8 +409,8 @@ TEST_F(FlatTreeTraversalTest, nextSiblingNotInDocumentFlatTree)
|
| "<content select='#m11'></content>";
|
| setupSampleHTML(mainHTML, shadowHTML, 1);
|
|
|
| - RefPtrWillBeRawPtr<Element> body = document().body();
|
| - RefPtrWillBeRawPtr<Element> m10 = body->querySelector("#m10", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> body = document().body();
|
| + RawPtr<Element> m10 = body->querySelector("#m10", ASSERT_NO_EXCEPTION);
|
|
|
| EXPECT_EQ(nullptr, FlatTreeTraversal::nextSibling(*m10));
|
| EXPECT_EQ(nullptr, FlatTreeTraversal::previousSibling(*m10));
|
| @@ -438,24 +438,24 @@ TEST_F(FlatTreeTraversalTest, redistribution)
|
| "<span id='s21'>s21</span>"
|
| "</div>";
|
|
|
| - RefPtrWillBeRawPtr<Element> body = document().body();
|
| - RefPtrWillBeRawPtr<Element> m1 = body->querySelector("#m1", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> m10 = body->querySelector("#m10", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> body = document().body();
|
| + RawPtr<Element> m1 = body->querySelector("#m1", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> m10 = body->querySelector("#m10", ASSERT_NO_EXCEPTION);
|
|
|
| - RefPtrWillBeRawPtr<ShadowRoot> shadowRoot1 = m1->openShadowRoot();
|
| - RefPtrWillBeRawPtr<Element> s1 = shadowRoot1->querySelector("#s1", ASSERT_NO_EXCEPTION);
|
| + RawPtr<ShadowRoot> shadowRoot1 = m1->openShadowRoot();
|
| + RawPtr<Element> s1 = shadowRoot1->querySelector("#s1", ASSERT_NO_EXCEPTION);
|
|
|
| attachV0ShadowRoot(*s1, shadowHTML2);
|
|
|
| - RefPtrWillBeRawPtr<ShadowRoot> shadowRoot2 = s1->openShadowRoot();
|
| - RefPtrWillBeRawPtr<Element> s21 = shadowRoot2->querySelector("#s21", ASSERT_NO_EXCEPTION);
|
| + RawPtr<ShadowRoot> shadowRoot2 = s1->openShadowRoot();
|
| + RawPtr<Element> s21 = shadowRoot2->querySelector("#s21", ASSERT_NO_EXCEPTION);
|
|
|
| EXPECT_EQ(s21.get(), FlatTreeTraversal::nextSibling(*m10));
|
| EXPECT_EQ(m10.get(), FlatTreeTraversal::previousSibling(*s21));
|
|
|
| // FlatTreeTraversal::traverseSiblings does not work for a node which is not in a document flat tree.
|
| // e.g. The following test fails. The result of FlatTreeTraversal::previousSibling(*m11)) will be #m10, instead of nullptr.
|
| - // RefPtrWillBeRawPtr<Element> m11 = body->querySelector("#m11", ASSERT_NO_EXCEPTION);
|
| + // RawPtr<Element> m11 = body->querySelector("#m11", ASSERT_NO_EXCEPTION);
|
| // EXPECT_EQ(nullptr, FlatTreeTraversal::previousSibling(*m11));
|
| }
|
|
|
| @@ -473,17 +473,17 @@ TEST_F(FlatTreeTraversalTest, v1Simple)
|
| "<div id='shadow-child2'></div>";
|
|
|
| setupDocumentTree(mainHTML);
|
| - RefPtrWillBeRawPtr<Element> body = document().body();
|
| - RefPtrWillBeRawPtr<Element> host = body->querySelector("#host", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> child1 = body->querySelector("#child1", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> child2 = body->querySelector("#child2", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> body = document().body();
|
| + RawPtr<Element> host = body->querySelector("#host", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> child1 = body->querySelector("#child1", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> child2 = body->querySelector("#child2", ASSERT_NO_EXCEPTION);
|
|
|
| attachOpenShadowRoot(*host, shadowHTML);
|
| - RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = host->openShadowRoot();
|
| - RefPtrWillBeRawPtr<Element> slot1 = shadowRoot->querySelector("[name=slot1]", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> slot2 = shadowRoot->querySelector("[name=slot2]", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> shadowChild1 = shadowRoot->querySelector("#shadow-child1", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> shadowChild2 = shadowRoot->querySelector("#shadow-child2", ASSERT_NO_EXCEPTION);
|
| + RawPtr<ShadowRoot> shadowRoot = host->openShadowRoot();
|
| + RawPtr<Element> slot1 = shadowRoot->querySelector("[name=slot1]", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> slot2 = shadowRoot->querySelector("[name=slot2]", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> shadowChild1 = shadowRoot->querySelector("#shadow-child1", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> shadowChild2 = shadowRoot->querySelector("#shadow-child2", ASSERT_NO_EXCEPTION);
|
|
|
| EXPECT_TRUE(slot1);
|
| EXPECT_TRUE(slot2);
|
| @@ -520,30 +520,30 @@ TEST_F(FlatTreeTraversalTest, v1Redistribution)
|
|
|
| setupDocumentTree(mainHTML);
|
|
|
| - RefPtrWillBeRawPtr<Element> body = document().body();
|
| - RefPtrWillBeRawPtr<Element> d1 = body->querySelector("#d1", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> d2 = body->querySelector("#d2", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> d3 = body->querySelector("#d3", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> d4 = body->querySelector("#d4", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> d5 = body->querySelector("#d5", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> d6 = body->querySelector("#d6", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> body = document().body();
|
| + RawPtr<Element> d1 = body->querySelector("#d1", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> d2 = body->querySelector("#d2", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> d3 = body->querySelector("#d3", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> d4 = body->querySelector("#d4", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> d5 = body->querySelector("#d5", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> d6 = body->querySelector("#d6", ASSERT_NO_EXCEPTION);
|
|
|
| attachOpenShadowRoot(*d1, shadowHTML1);
|
| - RefPtrWillBeRawPtr<ShadowRoot> shadowRoot1 = d1->openShadowRoot();
|
| - RefPtrWillBeRawPtr<Element> d11 = shadowRoot1->querySelector("#d1-1", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> d12 = shadowRoot1->querySelector("#d1-2", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> d13 = shadowRoot1->querySelector("#d1-3", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> d14 = shadowRoot1->querySelector("#d1-4", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> d1s0 = shadowRoot1->querySelector("#d1-s0", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> d1s1 = shadowRoot1->querySelector("[name=d1-s1]", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> d1s2 = shadowRoot1->querySelector("[name=d1-s2]", ASSERT_NO_EXCEPTION);
|
| + RawPtr<ShadowRoot> shadowRoot1 = d1->openShadowRoot();
|
| + RawPtr<Element> d11 = shadowRoot1->querySelector("#d1-1", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> d12 = shadowRoot1->querySelector("#d1-2", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> d13 = shadowRoot1->querySelector("#d1-3", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> d14 = shadowRoot1->querySelector("#d1-4", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> d1s0 = shadowRoot1->querySelector("#d1-s0", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> d1s1 = shadowRoot1->querySelector("[name=d1-s1]", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> d1s2 = shadowRoot1->querySelector("[name=d1-s2]", ASSERT_NO_EXCEPTION);
|
|
|
| attachOpenShadowRoot(*d11, shadowHTML2);
|
| - RefPtrWillBeRawPtr<ShadowRoot> shadowRoot2 = d11->openShadowRoot();
|
| - RefPtrWillBeRawPtr<Element> d111 = shadowRoot2->querySelector("#d1-1-1", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> d112 = shadowRoot2->querySelector("#d1-1-2", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> d11s1 = shadowRoot2->querySelector("[name=d1-1-s1]", ASSERT_NO_EXCEPTION);
|
| - RefPtrWillBeRawPtr<Element> d11s2 = shadowRoot2->querySelector("[name=d1-1-s2]", ASSERT_NO_EXCEPTION);
|
| + RawPtr<ShadowRoot> shadowRoot2 = d11->openShadowRoot();
|
| + RawPtr<Element> d111 = shadowRoot2->querySelector("#d1-1-1", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> d112 = shadowRoot2->querySelector("#d1-1-2", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> d11s1 = shadowRoot2->querySelector("[name=d1-1-s1]", ASSERT_NO_EXCEPTION);
|
| + RawPtr<Element> d11s2 = shadowRoot2->querySelector("[name=d1-1-s2]", ASSERT_NO_EXCEPTION);
|
|
|
| EXPECT_TRUE(d5);
|
| EXPECT_TRUE(d12);
|
|
|