aboutsummaryrefslogtreecommitdiffstats
path: root/tests/wpt/web-platform-tests/mathml/relations/css-styling
diff options
context:
space:
mode:
authorWPT Sync Bot <josh+wptsync@joshmatthews.net>2020-05-28 08:18:22 +0000
committerWPT Sync Bot <josh+wptsync@joshmatthews.net>2020-05-28 11:23:41 +0000
commit1b463fce85f9be158bdadb3c3c896c227a47d149 (patch)
treeb6e5e875beba9a281b6ad140a85f462d97733406 /tests/wpt/web-platform-tests/mathml/relations/css-styling
parentb0f0bd8282e797c03430a24bd31702b7f5743fad (diff)
downloadservo-1b463fce85f9be158bdadb3c3c896c227a47d149.tar.gz
servo-1b463fce85f9be158bdadb3c3c896c227a47d149.zip
Update web-platform-tests to revision 5c34fc630374b9eb0559139a486ff1a2e4247c4f
Diffstat (limited to 'tests/wpt/web-platform-tests/mathml/relations/css-styling')
-rw-r--r--tests/wpt/web-platform-tests/mathml/relations/css-styling/attribute-mapping-001.html3
-rw-r--r--tests/wpt/web-platform-tests/mathml/relations/css-styling/default-font-family.html36
-rw-r--r--tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/border-002.html30
3 files changed, 53 insertions, 16 deletions
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/attribute-mapping-001.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/attribute-mapping-001.html
index fde3a606ae2..2982fc5a19e 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/attribute-mapping-001.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/attribute-mapping-001.html
@@ -42,8 +42,7 @@
test(function() {
assert_equals(style.getPropertyValue("color"),
- tag === "merror" ?
- "rgb(255, 0, 0)" : "rgb(0, 0, 255)",
+ "rgb(0, 0, 255)",
"no attribute");
element.setAttribute("mathcolor", "black");
assert_equals(style.getPropertyValue("color"), "rgb(0, 0, 0)", "attribute specified");
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/default-font-family.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/default-font-family.html
new file mode 100644
index 00000000000..413227ed46f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/default-font-family.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Default font-family on the &lt;math&gt; root</title>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#the-top-level-math-element">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#user-agent-stylesheet">
+<meta name="assert" content="Verify that the default font-family is 'math'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+ <div id="log"></div>
+ <div style="font-family: BB2F7F3E9FEE11EA96DF67A737751C2F;">
+ <div id="inherited-reference"></div>
+ <math id="math-not-inherited"></math>
+ </div>
+ <math id="math-default"></math>
+
+ <script>
+ function getFontFamily(id) {
+ return window.getComputedStyle(document.getElementById(id)).fontFamily;
+ }
+
+ test(function () {
+ assert_equals(getFontFamily("inherited-reference"), "BB2F7F3E9FEE11EA96DF67A737751C2F");
+ assert_not_equals(getFontFamily("math-not-inherited"), getFontFamily("inherited-reference"));
+ }, "Default font-family on <math> is not inherited");
+
+ test(function () {
+ assert_equals(getFontFamily("math-not-inherited"), "math");
+ assert_equals(getFontFamily("math-default"), "math");
+ }, "Default font-family on <math> is 'math'");
+ </script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/border-002.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/border-002.html
index 38d89aa186e..2556f680ca5 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/border-002.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/border-002.html
@@ -35,28 +35,30 @@
continue;
}
+ var default_border = tag === "merror" ? 1 : 0;
+
test(function() {
assert_true(MathMLFeatureDetection[`has_${tag}`](), `${tag} is supported`);
var s = compareSpaceWithAndWithoutStyle(tag, style);
- assert_approx_equals(s.left_delta, 30, epsilon, "left border");
- assert_approx_equals(s.right_delta, 40, epsilon, "right border");
- assert_approx_equals(s.top_delta, 50, epsilon, "top border");
- assert_approx_equals(s.bottom_delta, 60, epsilon, "bottom border");
- assert_approx_equals(s.element_width_delta, 30 + 40, epsilon, "element width");
- assert_approx_equals(s.element_height_delta, 50 + 60, epsilon, "element height");
- assert_approx_equals(s.preferred_width_delta, 30 + 40, epsilon, "element preferred width");
+ assert_approx_equals(s.left_delta + default_border, 30, epsilon, "left border");
+ assert_approx_equals(s.right_delta + default_border, 40, epsilon, "right border");
+ assert_approx_equals(s.top_delta + default_border, 50, epsilon, "top border");
+ assert_approx_equals(s.bottom_delta + default_border, 60, epsilon, "bottom border");
+ assert_approx_equals(s.element_width_delta + 2 * default_border, 30 + 40, epsilon, "element width");
+ assert_approx_equals(s.element_height_delta + 2 * default_border, 50 + 60, epsilon, "element height");
+ assert_approx_equals(s.preferred_width_delta + 2 * default_border, 30 + 40, epsilon, "element preferred width");
}, `Border properties on ${tag}`);
test(function() {
assert_true(MathMLFeatureDetection[`has_${tag}`](), `${tag} is supported`);
var s = compareSpaceWithAndWithoutStyle(tag, style, null, "rtl");
- assert_approx_equals(s.left_delta, 30, epsilon, "left border");
- assert_approx_equals(s.right_delta, 40, epsilon, "right border");
- assert_approx_equals(s.top_delta, 50, epsilon, "top border");
- assert_approx_equals(s.bottom_delta, 60, epsilon, "bottom border");
- assert_approx_equals(s.element_width_delta, 30 + 40, epsilon, "element width");
- assert_approx_equals(s.element_height_delta, 50 + 60, epsilon, "element height");
- assert_approx_equals(s.preferred_width_delta, 30 + 40, epsilon, "element preferred width");
+ assert_approx_equals(s.left_delta + default_border, 30, epsilon, "left border");
+ assert_approx_equals(s.right_delta + default_border, 40, epsilon, "right border");
+ assert_approx_equals(s.top_delta + default_border, 50, epsilon, "top border");
+ assert_approx_equals(s.bottom_delta + default_border, 60, epsilon, "bottom border");
+ assert_approx_equals(s.element_width_delta + 2 * default_border, 30 + 40, epsilon, "element width");
+ assert_approx_equals(s.element_height_delta + 2 * default_border, 50 + 60, epsilon, "element height");
+ assert_approx_equals(s.preferred_width_delta + 2 * default_border, 30 + 40, epsilon, "element preferred width");
}, `Border properties on ${tag} (rtl)`);
}