Skip to content

Commit

Permalink
Implement animation behavior of the interpolate-size CSS property.
Browse files Browse the repository at this point in the history
This implements the animation behavior of the interpolate-size CSS
property to enable CSS animations between sizing keywords when possible,
and removes a feature flag (and corresponding virtual test suite) that
enabled the same.

For more on the interpolate-size property, see:
https://chromestatus.com/feature/5196713071738880
https://drafts.csswg.org/css-values-5/#interpolate-size
w3c/csswg-drafts#10294

Bug: 313072
Fixed: 349903574, 346977015
Change-Id: Ie4214af5ff5ea1e3253893dbcc5567e9026f1a06
  • Loading branch information
dbaron authored and chromium-wpt-export-bot committed Jul 17, 2024
1 parent 59497e6 commit 8a7b483
Show file tree
Hide file tree
Showing 19 changed files with 1,345 additions and 0 deletions.
21 changes: 21 additions & 0 deletions css/css-sizing/animation/height-composition.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/css/support/interpolation-testcommon.js"></script>
<style>
.target::before {
display: block;
content: "";
width: 75px;
height: 75px;
}
</style>

<body>
<script>
Expand Down Expand Up @@ -74,5 +82,18 @@
{at: 1, expect: 'auto'},
{at: 1.5, expect: 'auto'},
]);

test_composition({
property: 'height',
underlying: 'min-content', /* ignored */
addFrom: '100px',
addTo: '200px',
}, [
{at: -0.3, expect: '70px'},
{at: 0, expect: '100px'},
{at: 0.5, expect: '150px'},
{at: 1, expect: '200px'},
{at: 1.5, expect: '250px'},
]);
</script>
</body>
13 changes: 13 additions & 0 deletions css/css-sizing/animation/max-height-composition.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,18 @@
{at: 1, expect: 'none'},
{at: 1.5, expect: 'none'},
]);

test_composition({
property: 'max-height',
underlying: '100px',
addFrom: 'min-content',
addTo: '100px',
}, [
{at: -0.3, expect: 'min-content'},
{at: 0, expect: 'min-content'},
{at: 0.5, expect: '200px'},
{at: 1, expect: '200px'},
{at: 1.5, expect: '200px'},
]);
</script>
</body>
13 changes: 13 additions & 0 deletions css/css-sizing/animation/max-width-composition.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,18 @@
{at: 1, expect: 'none'},
{at: 1.5, expect: 'none'},
]);

test_composition({
property: 'max-width',
underlying: 'fit-content',
addFrom: '100px',
addTo: '200px',
}, [
{at: -0.3, expect: '70px'},
{at: 0, expect: '100px'},
{at: 0.5, expect: '150px'},
{at: 1, expect: '200px'},
{at: 1.5, expect: '250px'},
]);
</script>
</body>
13 changes: 13 additions & 0 deletions css/css-sizing/animation/min-height-composition.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,18 @@
{at: 1, expect: 'auto'},
{at: 1.5, expect: 'auto'},
]);

test_composition({
property: 'min-height',
underlying: '100px', /* ignored */
addFrom: 'min-content',
addTo: 'max-content',
}, [
{at: -0.3, expect: 'min-content'},
{at: 0, expect: 'min-content'},
{at: 0.5, expect: 'max-content'},
{at: 1, expect: 'max-content'},
{at: 1.5, expect: 'max-content'},
]);
</script>
</body>
13 changes: 13 additions & 0 deletions css/css-sizing/animation/min-width-composition.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,18 @@
{at: 1, expect: 'auto'},
{at: 1.5, expect: 'auto'},
]);

test_composition({
property: 'min-width',
underlying: 'min-content',
addFrom: 'max-content',
addTo: 'fit-content',
}, [
{at: -0.3, expect: 'max-content'},
{at: 0, expect: 'max-content'},
{at: 0.5, expect: 'fit-content'},
{at: 1, expect: 'fit-content'},
{at: 1.5, expect: 'fit-content'},
]);
</script>
</body>
23 changes: 23 additions & 0 deletions css/css-sizing/animation/width-composition.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/css/support/interpolation-testcommon.js"></script>
<style>
.target::before {
display: block;
content: "";
width: 75px;
height: 125px;
}
</style>

<body>
<script>
Expand Down Expand Up @@ -74,5 +82,20 @@
{at: 1, expect: 'auto'},
{at: 1.5, expect: 'auto'},
]);

test_composition({
property: 'width',
underlying: '100px',
addFrom: '100px',
addTo: 'min-content', /* 75px, not compatible */
}, [
{at: -0.3, expect: '200px'},
{at: 0, expect: '200px'},
{at: 0.5, expect: '75px'},
{at: 1, expect: '75px'},
{at: 1.5, expect: '75px'},
]);
</script>
</body>
</script>
</body>
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<!DOCTYPE html>
<meta charset="UTF-8">
<title>height composition with interpolate-size: allow-keywords</title>
<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#propdef-height">
<link rel="help" href="https://drafts.csswg.org/css-values-5/#interpolate-size">

<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/css/support/interpolation-testcommon.js"></script>
<style>
:root {
interpolate-size: allow-keywords;
}
.parent {
height: 200px;
}
.target {
width: 100px;
height: 150px;
}
.target::before {
display: block;
content: "";
width: 100px;
height: 50px;
}
</style>

<body>
<script>
test_composition({
property: 'height',
underlying: 'fit-content', /* 50px */
addFrom: '100px',
addTo: '200px',
}, [
{at: -0.3, expect: '120px'},
{at: 0, expect: '150px'},
{at: 0.5, expect: '200px'},
{at: 1, expect: '250px'},
{at: 1.5, expect: '300px'},
]);

test_composition({
property: 'height',
underlying: 'fit-content', /* ignored because the keywords aren't compatible */
addFrom: 'min-content', /* 50px */
addTo: '200px',
}, [
{at: -0.3, expect: '5px'},
{at: 0, expect: '50px'},
{at: 0.5, expect: '125px'},
{at: 1, expect: '200px'},
{at: 1.5, expect: '275px'},
]);
</script>
</body>
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
<!DOCTYPE html>
<meta charset="UTF-8">
<title>height interpolation with interpolate-size: allow-keywords</title>
<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#propdef-height">
<link rel="help" href="https://drafts.csswg.org/css-values-5/#interpolate-size">

<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/css/support/interpolation-testcommon.js"></script>

<style>
:root {
interpolate-size: allow-keywords;
}
.parent {
height: 200px;
}
.target {
width: 100px;
height: 150px;
}
.target::before {
display: block;
content: "";
width: 100px;
height: 50px;
}
</style>

<body></body>

<script>

test_interpolation({
property: 'height',
from: 'initial', /* auto, which is 50px */
to: '90px',
}, [
{at: -0.3, expect: '38px'},
{at: 0, expect: '50px'},
{at: 0.3, expect: '62px'},
{at: 0.6, expect: '74px'},
{at: 1, expect: '90px'},
{at: 1.5, expect: '110px'}
]);

test_interpolation({
property: 'height',
from: 'unset', /* auto, which is 50px */
to: '10px',
}, [
{at: -0.3, expect: '62px'},
{at: 0, expect: '50px'},
{at: 0.3, expect: '38px'},
{at: 0.6, expect: '26px'},
{at: 1, expect: '10px'},
{at: 1.5, expect: '0px'} // height can't be negative
]);

test_interpolation({
property: 'height',
from: '0px',
to: 'auto' /* 50px */
}, [
{at: -0.3, expect: '0px'}, // height can't be negative
{at: 0, expect: '0px'},
{at: 0.3, expect: '15px'},
{at: 0.6, expect: '30px'},
{at: 1, expect: '50px'},
{at: 1.5, expect: '75px'}
]);

test_interpolation({
property: 'height',
from: 'auto', /* 50px */
to: '10px',
}, [
{at: -0.3, expect: '62px'},
{at: 0, expect: '50px'},
{at: 0.3, expect: '38px'},
{at: 0.6, expect: '26px'},
{at: 1, expect: '10px'},
{at: 1.5, expect: '0px'} // height can't be negative
]);

test_interpolation({
property: 'height',
from: 'min-content', /* 50px */
to: 'inherit', /* 200px */
}, [
{at: -0.3, expect: '5px'},
{at: 0, expect: '50px'},
{at: 0.3, expect: '95px'},
{at: 0.6, expect: '140px'},
{at: 1, expect: '200px'},
{at: 1.5, expect: '275px'}
]);

// both 50px but not interpolable
test_no_interpolation({
property: 'height',
from: 'auto',
to: 'min-content',
});

test_interpolation({
property: 'height',
from: 'fit-content', /* 50px */
to: '10px',
}, [
{at: -0.3, expect: '62px'},
{at: 0, expect: '50px'},
{at: 0.3, expect: '38px'},
{at: 0.6, expect: '26px'},
{at: 1, expect: '10px'},
{at: 1.5, expect: '0px'} // height can't be negative
]);

// both 50px but not interpolable
test_no_interpolation({
property: 'height',
from: 'max-content',
to: 'fit-content',
});

test_no_interpolation({
property: 'height',
from: 'max-content',
to: 'stretch',
});

test_interpolation({
property: 'height',
from: 'max-content', /* 50px */
to: neutralKeyframe, /* 150px */
}, [
{at: -0.3, expect: '20px'},
{at: 0, expect: '50px'},
{at: 0.3, expect: '80px'},
{at: 0.6, expect: '110px'},
{at: 1, expect: '150px'},
{at: 1.5, expect: '200px'}
]);

test_interpolation({
property: 'height',
from: neutralKeyframe, /* 150px */
to: 'fit-content', /* 50px */
}, [
{at: -0.3, expect: '180px'},
{at: 0, expect: '150px'},
{at: 0.3, expect: '120px'},
{at: 0.6, expect: '90px'},
{at: 1, expect: '50px'},
{at: 1.5, expect: '0px'}
]);

</script>
Loading

0 comments on commit 8a7b483

Please sign in to comment.