diff --git a/testing/web-platform/tests/html/rendering/non-replaced-elements/form-controls/button-style.html b/testing/web-platform/tests/html/rendering/non-replaced-elements/form-controls/button-style.html
deleted file mode 100644
index 2d23b4a77d716..0000000000000
--- a/testing/web-platform/tests/html/rendering/non-replaced-elements/form-controls/button-style.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
default style on buttons
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/testing/web-platform/tests/html/rendering/non-replaced-elements/form-controls/resets.html b/testing/web-platform/tests/html/rendering/non-replaced-elements/form-controls/resets.html
index 8274973ea84c7..8576817caa826 100644
--- a/testing/web-platform/tests/html/rendering/non-replaced-elements/form-controls/resets.html
+++ b/testing/web-platform/tests/html/rendering/non-replaced-elements/form-controls/resets.html
@@ -34,9 +34,29 @@
input[type=reset i], input[type=button i], input[type=submit i], button {
text-align: center;
}
+input[type=radio i], input[type=checkbox i], input[type=reset i], input[type=button i],
+input[type=submit i], input[type=color i], input[type=search i], select, button {
+ box-sizing: border-box;
+}
+input, button {
+ display: inline-block;
+}
+/* in spec prose: */ select, textarea, meter, progress {
+ display: inline-block;
+}
+input[type=hidden i] { display: none !important; }
marquee {
text-align: initial;
}
+table { display: table; }
+caption { display: table-caption; }
+colgroup, colgroup[hidden] { display: table-column-group; }
+col, col[hidden] { display: table-column; }
+thead, thead[hidden] { display: table-header-group; }
+tbody, tbody[hidden] { display: table-row-group; }
+tfoot, tfoot[hidden] { display: table-footer-group; }
+tr, tr[hidden] { display: table-row; }
+td, th { display: table-cell; }
table {
text-indent: initial;
}
@@ -84,7 +104,9 @@
'text-transform',
'text-indent',
'text-shadow',
- 'text-align'];
+ 'text-align',
+ 'display',
+ 'box-sizing'];
runUAStyleTests(props);
diff --git a/testing/web-platform/tests/html/rendering/support/test-ua-stylesheet.js b/testing/web-platform/tests/html/rendering/support/test-ua-stylesheet.js
index 46bd9618a6651..49757a3682847 100644
--- a/testing/web-platform/tests/html/rendering/support/test-ua-stylesheet.js
+++ b/testing/web-platform/tests/html/rendering/support/test-ua-stylesheet.js
@@ -16,6 +16,16 @@ function runUAStyleTests(props) {
const testStyle = getComputedStyle(testEl);
const refStyle = getComputedStyle(refEl);
for (const prop of props) {
+ // Don't test display for some elements.
+ // TODO(zcorpan): https://github.com/whatwg/html/issues/4093
+ // TODO(zcorpan): https://github.com/whatwg/html/issues/5063
+ if (prop === 'display' &&
+ (testEl.localName === 'optgroup' ||
+ testEl.localName === 'option' ||
+ testEl.localName === 'marquee')
+ ) {
+ continue;
+ }
test(() => {
assert_equals(testStyle.getPropertyValue(prop), refStyle.getPropertyValue(prop));
}, `${testNameContext(testEl)} - ${prop}`);