From 13a641cf32df50d41b51d4e85bfc76f45a742fdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 16 Nov 2017 15:37:25 +0100
Subject: [PATCH] Bug 1417924: Don't test <style scoped> in display: contents
 tests. r=heycam

MozReview-Commit-ID: 5RSWXHmzKRi

--HG--
extra : rebase_source : b0e2d61905115b2d6057bdc355f4cf9ebd4ea8b5
---
 ...nts-style-inheritance-1-dom-mutations.html | 38 -------------------
 ...play-contents-style-inheritance-1-ref.html |  4 --
 ...tents-style-inheritance-1-stylechange.html | 14 +------
 .../display-contents-style-inheritance-1.html | 12 ------
 layout/reftests/css-display/reftest.list      |  6 +--
 5 files changed, 5 insertions(+), 69 deletions(-)

diff --git a/layout/reftests/css-display/display-contents-style-inheritance-1-dom-mutations.html b/layout/reftests/css-display/display-contents-style-inheritance-1-dom-mutations.html
index 20024b3d172a..c46bef29551c 100644
--- a/layout/reftests/css-display/display-contents-style-inheritance-1-dom-mutations.html
+++ b/layout/reftests/css-display/display-contents-style-inheritance-1-dom-mutations.html
@@ -92,32 +92,6 @@ function runTest() {
   d.appendChild(c);
   e.appendChild(d);
 
-  var e = $('t12');
-  var c = e.firstChild;
-  e.insertBefore(text("This text"), c);
-  e.insertBefore(b(" should be"), c);
-  e.appendChild(text(" green"));
-
-  var e = $('t13');
-  e.className = 'test';
-
-  var e = $('t14');
-  e.removeAttribute('style')
-
-  var e = $('t15');
-  e.innerHTML=':scope{color:green}';
-  var e = $('t16');
-  e.innerHTML=':scope{color:inherit}';
-  var e = $('t17');
-  e.innerHTML=':scope{color:inherit}';
-  e.parentNode.appendChild(text("green"));
-
-  var e = $('t18');
-  var c = e.appendChild(div("green"));
-  document.body.offsetHeight;
-  document.styleSheets[8].cssRules[0].style.setProperty('color','green');
-  document.body.offsetHeight;
-
   document.documentElement.className = '';
 }
 </script>
@@ -141,17 +115,5 @@ function runTest() {
 <span class="border"><div class="test" id="t9"></div></span>
 <span class="border"><div class="test" id="t10"></div></span>
 <span class="border"><div class="test" style="border:inherit" id="t11"></div></span>
-<br>
-
-<span style="color:red"><div class="test green" id="t12"></div></span>
-<span style="color:red"><span><style scoped>:scope{color:green}</style><di id="t13"v>green</div></span></span>
-<span style="color:red"><span class="test"><style scoped>:scope{color:green}</style><div id="t14" class="test" style="color:red">green</div></span></span>
-<span style="color:red"><div class="test"><style id="t15" scoped></style>green</div></span>
-<span style="color:red"><div class="test"><style scoped>:scope{color:green}</style>
-  <div class="test"><style scoped id="t16"></style>green</div>
-  <div class="test"><style scoped id="t17"></style></div></div></span>
-<span style="color:red"><div class="test"><style scoped>:scope{color:red}</style>
-  <div class="test" id="t18"><style scoped>:scope{color:red}</style></div></div></span>
-
 </body>
 </html>
diff --git a/layout/reftests/css-display/display-contents-style-inheritance-1-ref.html b/layout/reftests/css-display/display-contents-style-inheritance-1-ref.html
index 56b5fbbd505f..37649f545aff 100644
--- a/layout/reftests/css-display/display-contents-style-inheritance-1-ref.html
+++ b/layout/reftests/css-display/display-contents-style-inheritance-1-ref.html
@@ -34,9 +34,5 @@ b { font-weight:normal; }
 <span class="border"><div class="test"><div class="test"><b>1px green left border</b></div></div></span>
 <span class="border"><div class="test"><div class="test" style="border:inherit"><b>1px green left border</b></div></div></span>
 <span class="border"><div class="test" style="border:inherit"><div class="test"><b>2px green left border</b></div></div></span>
-<br>
-
-<span><div class="green">This text should be green green green green greengreen green</div></span>
-
 </body>
 </html>
diff --git a/layout/reftests/css-display/display-contents-style-inheritance-1-stylechange.html b/layout/reftests/css-display/display-contents-style-inheritance-1-stylechange.html
index 058db87d5c67..0f68aa5b09b9 100644
--- a/layout/reftests/css-display/display-contents-style-inheritance-1-stylechange.html
+++ b/layout/reftests/css-display/display-contents-style-inheritance-1-stylechange.html
@@ -26,6 +26,8 @@ function runTest() {
     elms[i].classList.remove('test');
     elms[i].classList.add('test2');
   }
+  // FIXME(emilio): This basically does a full subtree restyle, and could hide
+  // bugs in the previous parts of the test.
   document.body.lang = 'foo';
   document.body.offsetWidth;
 
@@ -51,17 +53,5 @@ function runTest() {
 <span class="border"><div class="test"><div class="test"><b>1px green left border</b></div></div></span>
 <span class="border"><div class="test"><div class="test" style="border:inherit"><b>1px green left border</b></div></div></span>
 <span class="border"><div class="test" style="border:inherit"><div class="test" style="border:inherit"><b>2px green left border</b></div></div></span>
-<br>
-
-<span style="color:red"><span class="test3 green">This text should be green</span></span>
-<span style="color:red"><span><style scoped>:scope{color:green}</style><div class="test">green</div></span></span>
-<span style="color:red"><span class="test"><style scoped>:scope{color:green}</style><div class="test">green</div></span></span>
-<span style="color:red"><div class="test"><style scoped>:scope{color:green}</style>green</div></span>
-<span style="color:red"><div class="test"><style scoped>:scope{color:red}</style>
-  <div class="test"><style scoped>:scope{color:green}</style>green</div>
-  <div class="test"><style scoped>:scope{color:green}</style>green</div></div></span>
-<span style="color:red"><div class="test"><style scoped>:scope{color:green}</style><div class="test">
-  <div id="t18" class="test"><style scoped>:scope{color:inherit}</style>green</div></div></div></span>
-
 </body>
 </html>
diff --git a/layout/reftests/css-display/display-contents-style-inheritance-1.html b/layout/reftests/css-display/display-contents-style-inheritance-1.html
index c4796a769080..3dab318b95df 100644
--- a/layout/reftests/css-display/display-contents-style-inheritance-1.html
+++ b/layout/reftests/css-display/display-contents-style-inheritance-1.html
@@ -35,17 +35,5 @@ b { border:inherit; font-weight:normal; }
 <span class="border"><div class="test"><div class="test"><b>1px green left border</b></div></div></span>
 <span class="border"><div class="test"><div class="test" style="border:inherit"><b>1px green left border</b></div></div></span>
 <span class="border"><div class="test" style="border:inherit"><div class="test" style="border:inherit"><b>2px green left border</b></div></div></span>
-<br>
-
-<span style="color:red"><div class="test green">This text should be green</div></span>
-<span style="color:red"><span><style scoped>:scope{color:green}</style><div class="test">green</div></span></span>
-<span style="color:red"><span class="test"><style scoped>:scope{color:green}</style><div class="test">green</div></span></span>
-<span style="color:red"><div class="test"><style scoped>:scope{color:green}</style>green</div></span>
-<span style="color:red"><div class="test"><style scoped>:scope{color:red}</style>
-  <div class="test"><style scoped>:scope{color:green}</style>green</div>
-  <div class="test"><style scoped>:scope{color:green}</style>green</div></div></span>
-<span style="color:red"><div class="test"><style scoped>:scope{color:red}</style><div class="test"><style scoped>:scope{color:red}</style>
-  <div class="test"><style scoped>:scope{color:green}</style>green</div></div></div></span>
-
 </body>
 </html>
diff --git a/layout/reftests/css-display/reftest.list b/layout/reftests/css-display/reftest.list
index 9313330b6a81..3d0c1b3044ee 100644
--- a/layout/reftests/css-display/reftest.list
+++ b/layout/reftests/css-display/reftest.list
@@ -7,9 +7,9 @@ fuzzy-if(Android,8,604) == display-contents-acid-dyn-2.html display-contents-aci
 fuzzy-if(Android,8,604) == display-contents-acid-dyn-3.html display-contents-acid-ref.html
 == display-contents-generated-content.html display-contents-generated-content-ref.html
 == display-contents-generated-content-2.html display-contents-generated-content-ref.html
-fails-if(styloVsGecko||stylo) pref(layout.css.scoped-style.enabled,true) == display-contents-style-inheritance-1.html display-contents-style-inheritance-1-ref.html
-fails-if(styloVsGecko||stylo) pref(layout.css.scoped-style.enabled,true) == display-contents-style-inheritance-1-stylechange.html display-contents-style-inheritance-1-ref.html
-fuzzy-if(winWidget,12,100) skip-if(styloVsGecko||stylo) pref(layout.css.scoped-style.enabled,true) == display-contents-style-inheritance-1-dom-mutations.html display-contents-style-inheritance-1-ref.html
+== display-contents-style-inheritance-1.html display-contents-style-inheritance-1-ref.html
+== display-contents-style-inheritance-1-stylechange.html display-contents-style-inheritance-1-ref.html
+fuzzy-if(winWidget,12,100) == display-contents-style-inheritance-1-dom-mutations.html display-contents-style-inheritance-1-ref.html
 == display-contents-tables.xhtml display-contents-tables-ref.xhtml
 == display-contents-tables-2.xhtml display-contents-tables-ref.xhtml
 == display-contents-tables-3.xhtml display-contents-tables-3-ref.xhtml