| Index: LayoutTests/fast/dom/shadow/content-combinator-with-shadow-deep.html
|
| diff --git a/LayoutTests/fast/dom/shadow/content-pseudo-element-with-cat.html b/LayoutTests/fast/dom/shadow/content-combinator-with-shadow-deep.html
|
| similarity index 72%
|
| rename from LayoutTests/fast/dom/shadow/content-pseudo-element-with-cat.html
|
| rename to LayoutTests/fast/dom/shadow/content-combinator-with-shadow-deep.html
|
| index e33ecd7e7cf79654ec54dc2da71f9988f0d0e772..09d83eb33a987d6e5d1ab499be0999639fde368e 100644
|
| --- a/LayoutTests/fast/dom/shadow/content-pseudo-element-with-cat.html
|
| +++ b/LayoutTests/fast/dom/shadow/content-combinator-with-shadow-deep.html
|
| @@ -9,10 +9,15 @@
|
| <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 = '';
|
| @@ -23,7 +28,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(
|
| @@ -33,7 +38,7 @@ sandbox.appendChild(
|
| createDOM('div', {'class': 'content'},
|
| document.createTextNode('content'))));
|
|
|
| -shouldBe('window.getComputedStyle(document.querySelector("#host1 > .content")).color', '"rgb(0, 128, 0)"');
|
| +shouldBe('colorOf("#host1 > .content")', '"rgb(0, 128, 0)"');
|
|
|
| cleanUp();
|
|
|
| @@ -42,7 +47,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(
|
| @@ -52,7 +57,7 @@ sandbox.appendChild(
|
| createDOM('div', {'class': 'content'},
|
| document.createTextNode('content'))));
|
|
|
| -shouldBe('window.getComputedStyle(document.querySelector("#host1 > .content")).color', '"rgb(0, 128, 0)"');
|
| +shouldBe('colorOf("#host1 > .content")', '"rgb(0, 128, 0)"');
|
|
|
| cleanUp();
|
|
|
| @@ -61,8 +66,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', {},
|
| @@ -75,7 +80,7 @@ sandbox.appendChild(
|
| createDOM('div', {'class': 'content'},
|
| document.createTextNode('content'))));
|
|
|
| -shouldBe('window.getComputedStyle(document.querySelector("#host1 > .content")).color', '"rgb(0, 128, 0)"');
|
| +shouldBe('colorOf("#host1 > .content")', '"rgb(0, 128, 0)"');
|
|
|
| cleanUp();
|
|
|
| @@ -84,7 +89,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', {},
|
| @@ -97,7 +102,7 @@ sandbox.appendChild(
|
| createDOM('div', {'class': 'content'},
|
| document.createTextNode('content'))));
|
|
|
| -shouldNotBe('window.getComputedStyle(document.querySelector("#host1 > .content")).color', '"rgb(255, 0, 0)"');
|
| +shouldNotBe('colorOf("#host1 > .content")', '"rgb(255, 0, 0)"');
|
|
|
| cleanUp();
|
|
|
| @@ -106,7 +111,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(
|
| @@ -116,7 +121,7 @@ sandbox.appendChild(
|
| createDOM('div', {'class': 'content'},
|
| document.createTextNode('content'))));
|
|
|
| -shouldBe('window.getComputedStyle(document.querySelector("#host1 > .content")).color', '"rgb(0, 128, 0)"');
|
| +shouldBe('colorOf("#host1 > .content")', '"rgb(0, 128, 0)"');
|
|
|
| cleanUp();
|
|
|
|
|