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

Unified Diff: LayoutTests/fast/dom/shadow/content-pseudo-element-with-cat.html

Issue 205563004: Revert of Implement /content/ combinator. (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
Index: LayoutTests/fast/dom/shadow/content-pseudo-element-with-cat.html
diff --git a/LayoutTests/fast/dom/shadow/content-combinator-with-shadow-deep.html b/LayoutTests/fast/dom/shadow/content-pseudo-element-with-cat.html
similarity index 72%
rename from LayoutTests/fast/dom/shadow/content-combinator-with-shadow-deep.html
rename to LayoutTests/fast/dom/shadow/content-pseudo-element-with-cat.html
index 09d83eb33a987d6e5d1ab499be0999639fde368e..e33ecd7e7cf79654ec54dc2da71f9988f0d0e772 100644
--- a/LayoutTests/fast/dom/shadow/content-combinator-with-shadow-deep.html
+++ b/LayoutTests/fast/dom/shadow/content-pseudo-element-with-cat.html
@@ -9,15 +9,10 @@
<pre id="console"></pre>
</body>
<script>
-description("Test for /content/ with /shadow-deep/ and :host.");
+description("Test for ::content with /shadow-deep/ and :host.");
var sandbox = document.getElementById('sandbox');
-function colorOf(selector)
-{
- return document.defaultView.getComputedStyle(document.querySelector(selector), null).getPropertyValue('color');
-}
-
function cleanUp()
{
sandbox.innerHTML = '';
@@ -28,7 +23,7 @@ sandbox.appendChild(
createShadowRoot(
createDOM('style', {},
document.createTextNode(
- ':host(#host1) /shadow-deep/ #content1 /content/ .content { color: green; }')),
+ ':host(#host1) /shadow-deep/ #content1::content > .content { color: green; }')),
createDOM('div', {},
createDOM('div', {'id': 'host2'},
createShadowRoot(
@@ -38,7 +33,7 @@ sandbox.appendChild(
createDOM('div', {'class': 'content'},
document.createTextNode('content'))));
-shouldBe('colorOf("#host1 > .content")', '"rgb(0, 128, 0)"');
+shouldBe('window.getComputedStyle(document.querySelector("#host1 > .content")).color', '"rgb(0, 128, 0)"');
cleanUp();
@@ -47,7 +42,7 @@ sandbox.appendChild(
createShadowRoot(
createDOM('style', {},
document.createTextNode(
- '#host2 /shadow-deep/ #content2 /content/ #parentOfContent1 > #content1 /content/ .content { color: green; }')),
+ '#host2 /shadow-deep/ #content2::content > #parentOfContent1 > #content1::content > .content { color: green; }')),
createDOM('div', {},
createDOM('div', {'id': 'host2'},
createShadowRoot(
@@ -57,7 +52,7 @@ sandbox.appendChild(
createDOM('div', {'class': 'content'},
document.createTextNode('content'))));
-shouldBe('colorOf("#host1 > .content")', '"rgb(0, 128, 0)"');
+shouldBe('window.getComputedStyle(document.querySelector("#host1 > .content")).color', '"rgb(0, 128, 0)"');
cleanUp();
@@ -66,8 +61,8 @@ sandbox.appendChild(
createShadowRoot(
createDOM('style', {},
document.createTextNode(
- ':host /shadow-deep/ #content2 /content/ #parentOfShadow1 > #shadow1 /content/ .content { color: green; }' +
- ':host /shadow-deep/ #content2 /content/ #shadow1 /content/ #content1 /content/ .content { color: red; }')),
+ ':host /shadow-deep/ #content2::content > #parentOfShadow1 > #shadow1::content > .content { color: green; }' +
+ ':host /shadow-deep/ #content2::content > #shadow1::content > #content1::content > .content { color: red; }')),
createDOM('content', {'id': 'content1'})),
createShadowRoot(
createDOM('div', {},
@@ -80,7 +75,7 @@ sandbox.appendChild(
createDOM('div', {'class': 'content'},
document.createTextNode('content'))));
-shouldBe('colorOf("#host1 > .content")', '"rgb(0, 128, 0)"');
+shouldBe('window.getComputedStyle(document.querySelector("#host1 > .content")).color', '"rgb(0, 128, 0)"');
cleanUp();
@@ -89,7 +84,7 @@ sandbox.appendChild(
createShadowRoot(
createDOM('style', {},
document.createTextNode(
- ':host /shadow-deep/ :host > #content2 /content/ #shadow1 /content/ #content1 /content/ .content { color: red; }')),
+ ':host /shadow-deep/ :host > #content2::content > #shadow1::content > #content1::content > .content { color: red; }')),
createDOM('content', {'id': 'content1'})),
createShadowRoot(
createDOM('div', {},
@@ -102,7 +97,7 @@ sandbox.appendChild(
createDOM('div', {'class': 'content'},
document.createTextNode('content'))));
-shouldNotBe('colorOf("#host1 > .content")', '"rgb(255, 0, 0)"');
+shouldNotBe('window.getComputedStyle(document.querySelector("#host1 > .content")).color', '"rgb(255, 0, 0)"');
cleanUp();
@@ -111,7 +106,7 @@ sandbox.appendChild(
createShadowRoot(
createDOM('style', {},
document.createTextNode(
- ':host /shadow-deep/ #content2 /content/ #parentOfContent1 > #content1 /content/ .content { color: green; }')),
+ ':host /shadow-deep/ #content2::content > #parentOfContent1 > #content1::content > .content { color: green; }')),
createDOM('div', {},
createDOM('div', {'id': 'host2'},
createShadowRoot(
@@ -121,7 +116,7 @@ sandbox.appendChild(
createDOM('div', {'class': 'content'},
document.createTextNode('content'))));
-shouldBe('colorOf("#host1 > .content")', '"rgb(0, 128, 0)"');
+shouldBe('window.getComputedStyle(document.querySelector("#host1 > .content")).color', '"rgb(0, 128, 0)"');
cleanUp();

Powered by Google App Engine
This is Rietveld 408576698