LayoutTests/fast/dom/shadow/querySelector-with-shadow-all-and-shadow-deep.html - Issue 210713002: Implement ::shadow pseudo element and replace /shadow/ with ::shadow.

Unified Diff: LayoutTests/fast/dom/shadow/querySelector-with-shadow-all-and-shadow-deep.html

Issue 210713002: Implement ::shadow pseudo element and replace /shadow/ with ::shadow. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Fixed patch conflict Created 6 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

« LayoutTests/fast/css/invalidation/targeted-class-shadow-combinator-expected.txt ('K') | « LayoutTests/fast/dom/shadow/querySelector-for-useragent-shadowroot-expected.txt ('k') | LayoutTests/fast/dom/shadow/querySelector-with-shadow-all-and-shadow-deep-expected.txt » ('j') | Source/core/css/CSSParserValues.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: LayoutTests/fast/dom/shadow/querySelector-with-shadow-all-and-shadow-deep.html

diff --git a/LayoutTests/fast/dom/shadow/querySelector-with-shadow-all-and-shadow-deep.html b/LayoutTests/fast/dom/shadow/querySelector-with-shadow-all-and-shadow-deep.html

index dfd63405174c4b51540c25ac922fe70d813968d2..7b4daada1caf28afdb0d0b28e36de2d1002b7914 100644

--- a/LayoutTests/fast/dom/shadow/querySelector-with-shadow-all-and-shadow-deep.html

+++ b/LayoutTests/fast/dom/shadow/querySelector-with-shadow-all-and-shadow-deep.html

@@ -22,12 +22,12 @@ document.body.appendChild(

document.body.appendChild(

createDOM('pre', {'id': 'console'}));

-description('crbug.com/337616: test for querySelectorAll with /shadow/ and /shadow-deep/');

+description('crbug.com/337616: test for querySelectorAll with ::shadow and /shadow-deep/');

-shouldBe('document.querySelectorAll("#foo-host /shadow/ span").length', '3');

-shouldBe('document.querySelectorAll("#foo-host /shadow/ span")[0].id', '"not-top"');

-shouldBe('document.querySelectorAll("#foo-host /shadow/ span")[1].id', '"top"');

-shouldBe('document.querySelectorAll("#foo-host /shadow/ span")[2].id', '"inner-host"');

+shouldBe('document.querySelectorAll("#foo-host::shadow span").length', '3');

+shouldBe('document.querySelectorAll("#foo-host::shadow span")[0].id', '"not-top"');

+shouldBe('document.querySelectorAll("#foo-host::shadow span")[1].id', '"top"');

+shouldBe('document.querySelectorAll("#foo-host::shadow span")[2].id', '"inner-host"');

shouldBe('document.querySelectorAll("#foo-host /shadow-deep/ span").length', '5');

shouldBe('document.querySelectorAll("#foo-host /shadow-deep/ span")[0].id', '"not-top"');

@@ -38,8 +38,8 @@ shouldBe('document.querySelectorAll("#foo-host /shadow-deep/ span")[4].id', '"ou

// FIXME: after making "*" in shadow tree not to match shadow host, rebaseline.

var fooShadowRoot = getNodeInTreeOfTrees('foo-host/');

-shouldBe('fooShadowRoot.querySelectorAll("* /shadow/ span").length', '1');

-shouldBe('fooShadowRoot.querySelectorAll("* /shadow/ span")[0].id', '"nested"');

+shouldBe('fooShadowRoot.querySelectorAll("*::shadow span").length', '1');

+shouldBe('fooShadowRoot.querySelectorAll("*::shadow span")[0].id', '"nested"');

shouldBe('fooShadowRoot.querySelectorAll("* /shadow-deep/ span").length', '3');

shouldBe('fooShadowRoot.querySelectorAll("* /shadow-deep/ span")[0].id', '"not-top"');

@@ -50,36 +50,36 @@ shouldBe('fooShadowRoot.querySelectorAll("* /shadow-deep/ span")[2].id', '"inner

shouldBe('fooShadowRoot.querySelectorAll("#foo-host /shadow-deep/ span").length', '0');

// :host in foo's shadow tree can match div#foo-host.

-shouldBe('fooShadowRoot.querySelectorAll(":host(div#foo-host) /shadow/ span").length', '3');

-shouldBe('fooShadowRoot.querySelectorAll(":host(div#foo-host) /shadow/ span")[0].id', '"not-top"');

-shouldBe('fooShadowRoot.querySelectorAll(":host(div#foo-host) /shadow/ span")[1].id', '"top"');

-shouldBe('fooShadowRoot.querySelectorAll(":host(div#foo-host) /shadow/ span")[2].id', '"inner-host"');

+shouldBe('fooShadowRoot.querySelectorAll(":host(div#foo-host)::shadow span").length', '3');

+shouldBe('fooShadowRoot.querySelectorAll(":host(div#foo-host)::shadow span")[0].id', '"not-top"');

+shouldBe('fooShadowRoot.querySelectorAll(":host(div#foo-host)::shadow span")[1].id', '"top"');

+shouldBe('fooShadowRoot.querySelectorAll(":host(div#foo-host)::shadow span")[2].id', '"inner-host"');

// :ancestor in foo's shadow tree can match div#foo-host.

-shouldBe('fooShadowRoot.querySelectorAll(":ancestor(body) /shadow/ span").length', '3');

-shouldBe('fooShadowRoot.querySelectorAll(":ancestor(body) /shadow/ span")[0].id', '"not-top"');

-shouldBe('fooShadowRoot.querySelectorAll(":ancestor(body) /shadow/ span")[1].id', '"top"');

-shouldBe('fooShadowRoot.querySelectorAll(":ancestor(body) /shadow/ span")[2].id', '"inner-host"');

+shouldBe('fooShadowRoot.querySelectorAll(":ancestor(body)::shadow span").length', '3');

+shouldBe('fooShadowRoot.querySelectorAll(":ancestor(body)::shadow span")[0].id', '"not-top"');

+shouldBe('fooShadowRoot.querySelectorAll(":ancestor(body)::shadow span")[1].id', '"top"');

+shouldBe('fooShadowRoot.querySelectorAll(":ancestor(body)::shadow span")[2].id', '"inner-host"');

var barHost = fooShadowRoot.getElementById('bar-host');

-shouldBe('barHost.querySelectorAll("#bar-host /shadow/ span").length', '1');

-shouldBe('barHost.querySelectorAll("#bar-host /shadow/ span")[0].id', '"nested"');

+shouldBe('barHost.querySelectorAll("#bar-host::shadow span").length', '1');

+shouldBe('barHost.querySelectorAll("#bar-host::shadow span")[0].id', '"nested"');

shouldBe('barHost.querySelectorAll(":host :scope span").length', '1');

shouldBe('barHost.querySelectorAll(":host :scope span")[0].id', '"inner-host"');

shouldBe('barHost.querySelectorAll(":host /shadow-deep/ #bar-host span").length', '1');

shouldBe('barHost.querySelectorAll(":host /shadow-deep/ #bar-host span")[0].id', '"inner-host"');

var barShadowRoot = getNodeInTreeOfTrees('foo-host/bar-host/');

-shouldBe('barShadowRoot.querySelectorAll("* /shadow/ span").length', '0');

+shouldBe('barShadowRoot.querySelectorAll("*::shadow span").length', '0');

shouldBe('barShadowRoot.querySelectorAll("* /shadow-deep/ span").length', '0');

-shouldBe('barShadowRoot.querySelectorAll(":host(div#bar-host) /shadow/ span").length', '1');

-shouldBe('barShadowRoot.querySelectorAll(":host(div#bar-host) /shadow/ span")[0].id', '"nested"');

+shouldBe('barShadowRoot.querySelectorAll(":host(div#bar-host)::shadow span").length', '1');

+shouldBe('barShadowRoot.querySelectorAll(":host(div#bar-host)::shadow span")[0].id', '"nested"');

shouldBe('barShadowRoot.querySelectorAll(":host(div#bar-host) /shadow-deep/ span").length', '1');

shouldBe('barShadowRoot.querySelectorAll(":host(div#bar-host) /shadow-deep/ span")[0].id', '"nested"');

-shouldBe('barShadowRoot.querySelectorAll(":ancestor(div#foo-host) /shadow/ span").length', '1');

-shouldBe('barShadowRoot.querySelectorAll(":ancestor(div#foo-host) /shadow/ span")[0].id', '"nested"');

+shouldBe('barShadowRoot.querySelectorAll(":ancestor(div#foo-host)::shadow span").length', '1');

+shouldBe('barShadowRoot.querySelectorAll(":ancestor(div#foo-host)::shadow span")[0].id', '"nested"');

shouldBe('barShadowRoot.querySelectorAll(":ancestor(div#foo-host) /shadow-deep/ span").length', '1');

shouldBe('barShadowRoot.querySelectorAll(":ancestor(div#foo-host) /shadow-deep/ span")[0].id', '"nested"');

</script>