Auto merge of #12768 - nox:fix-transition, r=SimonSapin

Fix interpolation of CalcLengthOrPercentage (fixes #12765)

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12768)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-08-09 09:03:10 -05:00 committed by GitHub
commit 44ebbfc20d
4 changed files with 59 additions and 5 deletions

View file

@ -6168,6 +6168,12 @@
"url": "/_mozilla/css/animations/basic-transition.html"
}
],
"css/animations/mixed-units.html": [
{
"path": "css/animations/mixed-units.html",
"url": "/_mozilla/css/animations/mixed-units.html"
}
],
"css/animations/transition-raf.html": [
{
"path": "css/animations/transition-raf.html",

View file

@ -0,0 +1,33 @@
<!doctype html>
<meta charset="utf-8">
<title>Animation test: mixed units.</title>
<style>
.animatable {
width: 50px;
height: 50px;
background: red;
animation: foo 1s infinite linear;
}
@keyframes foo {
from { width: 0%; }
to { width: 500px; }
}
</style>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<div class="animatable"></div>
<script>
var div = document.querySelector('.animatable');
async_test(function(t) {
window.addEventListener('load', function() {
var test = new window.TestBinding();
test.advanceClock(500);
assert_equals(getComputedStyle(div).getPropertyValue('width'), '250px');
test.advanceClock(500);
assert_equals(getComputedStyle(div).getPropertyValue('width'), '500px');
test.advanceClock(500);
assert_equals(getComputedStyle(div).getPropertyValue('width'), '250px');
t.done();
})
})
</script>