Bug 1038294 part 16 - WPT updates for new 'display' values. r=emilio
authorMats Palmgren <mats@mozilla.com>
Wed, 14 Aug 2019 14:35:39 +0000
changeset 487944 57bcf2eea1098285fa30160590eaea97bf483692
parent 487943 f919a62c86d1bebfd677f590b64ed04f974ae0cc
child 487945 34bc9228d814dcd95beb0a673883f10263f17b75
push id36433
push userbtara@mozilla.com
push dateWed, 14 Aug 2019 21:57:52 +0000
treeherdermozilla-central@7d9a2196d313 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersemilio
bugs1038294
milestone70.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1038294 part 16 - WPT updates for new 'display' values. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D39768
testing/web-platform/meta/css/css-display/parsing/display-valid.html.ini
testing/web-platform/meta/html/rendering/widgets/button-layout/display-other.html.ini
testing/web-platform/tests/css/css-display/parsing/display-invalid.html
testing/web-platform/tests/css/css-display/parsing/display-valid.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/css/css-display/parsing/display-valid.html.ini
@@ -0,0 +1,130 @@
+[display-valid.html]
+  [e.style['display'\] = "list-item inline flow" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "ruby block" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "run-in flow-root list-item" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "run-in table" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "run-in list-item flow" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "run-in flow" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "block ruby" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "run-in flow list-item" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "list-item flow-root inline" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "table run-in" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "flow inline list-item" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "flow-root inline list-item" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "inline list-item" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "list-item run-in" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "inline flow-root list-item" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "grid run-in" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "inline flow list-item" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "flow run-in" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "run-in list-item flow-root" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "run-in flow-root" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "inline list-item flow" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "run-in grid" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "list-item run-in flow" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "flow run-in list-item" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "flow list-item inline" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "flow-root run-in list-item" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "flow-root list-item inline" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "list-item flow-root run-in" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "list-item inline flow-root" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "flow-root list-item run-in" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "flow-root run-in" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "run-in ruby" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "list-item flow inline" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "flex run-in" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "run-in" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "list-item flow run-in" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "list-item run-in flow-root" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "run-in list-item" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "flow list-item run-in" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "ruby run-in" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "inline list-item flow-root" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "list-item inline" should set the property value]
+    expected: FAIL
+
+  [e.style['display'\] = "run-in flex" should set the property value]
+    expected: FAIL
+
--- a/testing/web-platform/meta/html/rendering/widgets/button-layout/display-other.html.ini
+++ b/testing/web-platform/meta/html/rendering/widgets/button-layout/display-other.html.ini
@@ -27,17 +27,14 @@
     expected: FAIL
 
   [display: run-in]
     expected: FAIL
 
   [display: table-row-group]
     expected: FAIL
 
-  [display: flow]
-    expected: FAIL
-
   [display: table-column-group]
     expected: FAIL
 
   [display: table-row]
     expected: FAIL
 
--- a/testing/web-platform/tests/css/css-display/parsing/display-invalid.html
+++ b/testing/web-platform/tests/css/css-display/parsing/display-invalid.html
@@ -11,11 +11,65 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/parsing-testcommon.js"></script>
 </head>
 <body>
 <script>
 test_invalid_value("display", "grid inline-grid");
 test_invalid_value("display", "none grid");
+test_invalid_value("display", "none flow");
+test_invalid_value("display", "none ruby");
+test_invalid_value("display", "none flow-root");
+test_invalid_value("display", "none list-item");
+test_invalid_value("display", "contents list-item");
+test_invalid_value("display", "list-item contents");
+test_invalid_value("display", "flow flow");
+test_invalid_value("display", "block block");
+test_invalid_value("display", "flow flow-root");
+test_invalid_value("display", "flow-root flow-root");
+test_invalid_value("display", "block inline");
+test_invalid_value("display", "flex ruby");
+test_invalid_value("display", "ruby flex");
+test_invalid_value("display", "inline inline");
+test_invalid_value("display", "flex flex");
+test_invalid_value("display", "grid flex");
+test_invalid_value("display", "ruby grid");
+test_invalid_value("display", "flex grid");
+test_invalid_value("display", "grid table");
+test_invalid_value("display", "table flex");
+test_invalid_value("display", "flex table");
+test_invalid_value("display", "ruby table");
+test_invalid_value("display", "table table");
+test_invalid_value("display", "table flow-root");
+test_invalid_value("display", "flow-root ruby");
+test_invalid_value("display", "list-item list-item");
+test_invalid_value("display", "list-item table");
+test_invalid_value("display", "flex list-item");
+test_invalid_value("display", "list-item grid");
+test_invalid_value("display", "flow flow list-item");
+test_invalid_value("display", "grid flow list-item");
+test_invalid_value("display", "flow list-item flow");
+test_invalid_value("display", "block list-item block");
+test_invalid_value("display", "list-item flow-root flow");
+test_invalid_value("display", "list-item block block");
+test_invalid_value("display", "list-item block list-item");
+test_invalid_value("display", "list-item flow-root list-item");
+test_invalid_value("display", "list-item flow-root block list-item");
+test_invalid_value("display", "list-item block flow-root list-item");
+test_invalid_value("display", "block list-item flow-root list-item");
+test_invalid_value("display", "flow-root list-item block list-item");
+test_invalid_value("display", "list-item ruby");
+test_invalid_value("display", "ruby list-item");
+test_invalid_value("display", "ruby ruby");
+test_invalid_value("display", "ruby flow");
+test_invalid_value("display", "flow ruby");
+test_invalid_value("display", "ruby flow-root");
+test_invalid_value("display", "grid ruby");
+test_invalid_value("display", "table ruby");
+test_invalid_value("display", "table-row flow");
+test_invalid_value("display", "flow table-row");
+test_invalid_value("display", "table-row-group flow-root");
+test_invalid_value("display", "flex table-row-group");
+
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-display/parsing/display-valid.html
+++ b/testing/web-platform/tests/css/css-display/parsing/display-valid.html
@@ -30,11 +30,104 @@ test_valid_value("display", "table-row-g
 test_valid_value("display", "table-header-group");
 test_valid_value("display", "table-footer-group");
 test_valid_value("display", "table-row");
 test_valid_value("display", "table-column-group");
 test_valid_value("display", "table-column");
 test_valid_value("display", "table-cell");
 test_valid_value("display", "table-caption");
 test_valid_value("display", "none");
+
+// https://drafts.csswg.org/css-display/#the-display-properties
+test_valid_value("display", "run-in");
+test_valid_value("display", "flow", "block");
+test_valid_value("display", "flow-root");
+test_valid_value("display", "ruby");
+
+test_valid_value("display", "flow list-item", "list-item");
+test_valid_value("display", "list-item flow", "list-item");
+test_valid_value("display", "flow-root list-item", "flow-root list-item");
+test_valid_value("display", "list-item flow-root", "flow-root list-item");
+
+test_valid_value("display", "block flow", "block");
+test_valid_value("display", "flow block", "block");
+test_valid_value("display", "flow-root block", "flow-root");
+test_valid_value("display", "block flow-root", "flow-root");
+test_valid_value("display", "flex block", "flex");
+test_valid_value("display", "block flex", "flex");
+test_valid_value("display", "grid block", "grid");
+test_valid_value("display", "block grid", "grid");
+test_valid_value("display", "table block", "table");
+test_valid_value("display", "block table", "table");
+test_valid_value("display", "block ruby", "block ruby");
+test_valid_value("display", "ruby block", "block ruby");
+test_valid_value("display", "block list-item", "list-item");
+test_valid_value("display", "list-item block", "list-item");
+test_valid_value("display", "flow block list-item", "list-item");
+test_valid_value("display", "block flow list-item", "list-item");
+test_valid_value("display", "flow list-item block", "list-item");
+test_valid_value("display", "block list-item flow", "list-item");
+test_valid_value("display", "list-item block flow", "list-item");
+test_valid_value("display", "list-item flow block", "list-item");
+test_valid_value("display", "flow-root block list-item", "flow-root list-item");
+test_valid_value("display", "block flow-root list-item", "flow-root list-item");
+test_valid_value("display", "flow-root list-item block", "flow-root list-item");
+test_valid_value("display", "block list-item flow-root", "flow-root list-item");
+test_valid_value("display", "list-item block flow-root", "flow-root list-item");
+test_valid_value("display", "list-item flow-root block", "flow-root list-item");
+
+test_valid_value("display", "inline flow", "inline");
+test_valid_value("display", "flow inline", "inline");
+test_valid_value("display", "flow-root inline", "inline-block");
+test_valid_value("display", "inline flow-root", "inline-block");
+test_valid_value("display", "flex inline", "inline-flex");
+test_valid_value("display", "inline flex", "inline-flex");
+test_valid_value("display", "grid inline", "inline-grid");
+test_valid_value("display", "inline grid", "inline-grid");
+test_valid_value("display", "table inline", "inline-table");
+test_valid_value("display", "inline table", "inline-table");
+test_valid_value("display", "inline ruby", "ruby");
+test_valid_value("display", "ruby inline", "ruby");
+test_valid_value("display", "inline list-item", "inline list-item");
+test_valid_value("display", "list-item inline", "inline list-item");
+test_valid_value("display", "flow inline list-item", "inline list-item");
+test_valid_value("display", "inline flow list-item", "inline list-item");
+test_valid_value("display", "flow list-item inline", "inline list-item");
+test_valid_value("display", "inline list-item flow", "inline list-item");
+test_valid_value("display", "list-item inline flow", "inline list-item");
+test_valid_value("display", "list-item flow inline", "inline list-item");
+test_valid_value("display", "flow-root inline list-item", "inline flow-root list-item");
+test_valid_value("display", "inline flow-root list-item", "inline flow-root list-item");
+test_valid_value("display", "flow-root list-item inline", "inline flow-root list-item");
+test_valid_value("display", "inline list-item flow-root", "inline flow-root list-item");
+test_valid_value("display", "list-item inline flow-root", "inline flow-root list-item");
+test_valid_value("display", "list-item flow-root inline", "inline flow-root list-item");
+
+test_valid_value("display", "run-in flow", "run-in");
+test_valid_value("display", "flow run-in", "run-in");
+test_valid_value("display", "flow-root run-in", "run-in flow-root");
+test_valid_value("display", "run-in flow-root", "run-in flow-root");
+test_valid_value("display", "flex run-in", "run-in flex");
+test_valid_value("display", "run-in flex", "run-in flex");
+test_valid_value("display", "grid run-in", "run-in grid");
+test_valid_value("display", "run-in grid", "run-in grid");
+test_valid_value("display", "table run-in", "run-in table");
+test_valid_value("display", "run-in table", "run-in table");
+test_valid_value("display", "run-in ruby", "run-in ruby");
+test_valid_value("display", "ruby run-in", "run-in ruby");
+test_valid_value("display", "run-in list-item", "run-in list-item");
+test_valid_value("display", "list-item run-in", "run-in list-item");
+test_valid_value("display", "flow run-in list-item", "run-in list-item");
+test_valid_value("display", "run-in flow list-item", "run-in list-item");
+test_valid_value("display", "flow list-item run-in", "run-in list-item");
+test_valid_value("display", "run-in list-item flow", "run-in list-item");
+test_valid_value("display", "list-item run-in flow", "run-in list-item");
+test_valid_value("display", "list-item flow run-in", "run-in list-item");
+test_valid_value("display", "flow-root run-in list-item", "run-in flow-root list-item");
+test_valid_value("display", "run-in flow-root list-item", "run-in flow-root list-item");
+test_valid_value("display", "flow-root list-item run-in", "run-in flow-root list-item");
+test_valid_value("display", "run-in list-item flow-root", "run-in flow-root list-item");
+test_valid_value("display", "list-item run-in flow-root", "run-in flow-root list-item");
+test_valid_value("display", "list-item flow-root run-in", "run-in flow-root list-item");
+
 </script>
 </body>
 </html>