Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-11 16:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Update calc() serialization to the spec.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-08-17 21:20:07 +02:00
parent d17f27640b
commit f8a6eccda2
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
5 changed files with 89 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -13512,6 +13512,12 @@
{}
]
],
"css/calc-serialization.html": [
[
"/_mozilla/css/calc-serialization.html",
{}
]
],
"css/empty-keyframes.html": [
[
"/_mozilla/css/empty-keyframes.html",
@ -22847,6 +22853,10 @@
"b9e77c824d0c96e51d51fb8f1e923d3ab67be027",
"testharness"
],
"css/calc-serialization.html": [
"628597eb36bf21a1ec982c7f6935ee7949c62044",
"testharness"
],
"css/canvas_as_block_element_a.html": [
"668d93da2dab9722998cc7c5785c20e2ab9a1ced",
"reftest"
@ -26508,7 +26518,7 @@
"testharness"
],
"mozilla/calc.html": [
"5d59d5b367a023e778ce6968acdeca6b8b7c3197",
"5b3ea33205a9f2404bd6976a2c7f6fc451be8e96",
"testharness"
],
"mozilla/canvas.initial.reset.2dstate.html": [

34
tests/wpt/mozilla/tests/css/calc-serialization.html Normal file
View file

@ -0,0 +1,34 @@
<!doctype html>
<meta charset="utf-8">
<title>CSS Values and Units: calc() serialization.</title>
<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@mozilla.com">
<link rel="help" href="https://drafts.csswg.org/css-values/#calc-serialize">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<!-- FIXME(emilio): Upstream when spec stops being under discussion -->
<div id="content"></div>
<script>
// NOTE(emilio): This intentionally doesn't test for order of percentages
// because of:
//
// https://github.com/w3c/csswg-drafts/issues/1731
test(function() {
// specified -> expected
var values = {
"calc(10px + 1vmin)": "calc(10px + 1vmin)",
"calc(10px + 1em)": "calc(1em + 10px)",
"calc(1vmin - 10px)": "calc(-10px + 1vmin)",
"calc(-10px + 1em)": "calc(1em - 10px)",
"calc(-10px)": "calc(-10px)",
};
var content = document.getElementById("content");
for (var prop in values) {
content.style.width = prop;
assert_equals(content.style.width, values[prop], "Serialization of " + prop);
}
}, "calc() serialization")
</script>

22
tests/wpt/mozilla/tests/mozilla/calc.html
View file

@ -46,13 +46,13 @@ var widthTests = [
// Alphabetical order
['calc(0ch + 0px + 0pt + 0pc + 0in + 0cm + 0mm + 0rem + 0em + 0ex + 0% + 0vw + 0vh + 0vmin + 0vmax)',
'calc(0ch + 0em + 0ex + 0rem + 0vh + 0vmax + 0vmin + 0vw + 0px + 0%)',
'calc(0% + 0ch + 0em + 0ex + 0px + 0rem + 0vh + 0vmax + 0vmin + 0vw)',
'0px'],
// Simplification
['calc((2 - 1) * 10px)', 'calc(10px)', '10px'],
['calc(((3 - 1) * (8 + 4)) * 10px)', 'calc(240px)', '240px'],
['calc(5 * (20px / 2 + 7 * (3em + 12px/4 + (8 - 2) * 2rem)))', 'calc(105em + 420rem + 155px)', '8555px'],
['calc(5 * (20px / 2 + 7 * (3em + 12px/4 + (8 - 2) * 2rem)))', 'calc(105em + 155px + 420rem)', '8555px'],
];
@ -107,7 +107,7 @@ var lengthOrPercentageProperties = [
lengthOrPercentageProperties.forEach(function(prop) {
test(function() {
div.style.setProperty(prop, 'calc(1px + 0%)');
assert_equals(div.style.getPropertyValue(prop), 'calc(1px + 0%)');
assert_equals(div.style.getPropertyValue(prop), 'calc(0% + 1px)');
}, 'calc for ' + prop);
});
@ -142,14 +142,14 @@ numberProperties.forEach(function(prop) {
var otherProperties = [
['border-width', 'calc(1px)', 'calc(1px)'],
['border-spacing', 'calc(1px)', 'calc(1px)'],
['transform-origin', 'calc(1px + 0%)', 'calc(1px + 0%) center 0px'],
['perspective-origin', 'calc(1px + 0%)', 'calc(1px + 0%) center'],
['background-size', 'calc(1px + 0%)', 'calc(1px + 0%) auto'],
['background-position', 'calc(1px + 0%) calc(2px + 0%)', 'calc(1px + 0%) calc(2px + 0%)'],
['border-top-left-radius', 'calc(1px + 0%)', 'calc(1px + 0%) calc(1px + 0%)'],
['border-bottom-left-radius', 'calc(1px + 0%)', 'calc(1px + 0%) calc(1px + 0%)'],
['border-top-right-radius', 'calc(1px + 0%)', 'calc(1px + 0%) calc(1px + 0%)'],
['border-bottom-right-radius', 'calc(1px + 0%)', 'calc(1px + 0%) calc(1px + 0%)'],
['transform-origin', 'calc(1px + 0%)', 'calc(0% + 1px) center 0px'],
['perspective-origin', 'calc(1px + 0%)', 'calc(0% + 1px) center'],
['background-size', 'calc(1px + 0%)', 'calc(0% + 1px) auto'],
['background-position', 'calc(1px + 0%) calc(2px + 0%)', 'calc(0% + 1px) calc(0% + 2px)'],
['border-top-left-radius', 'calc(1px + 0%)', 'calc(0% + 1px) calc(0% + 1px)'],
['border-bottom-left-radius', 'calc(1px + 0%)', 'calc(0% + 1px) calc(0% + 1px)'],
['border-top-right-radius', 'calc(1px + 0%)', 'calc(0% + 1px) calc(0% + 1px)'],
['border-bottom-right-radius', 'calc(1px + 0%)', 'calc(0% + 1px) calc(0% + 1px)'],
['counter-increment', 'foo calc(1 + 1)', 'foo calc(2)'],
];