Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(77)

Unified Diff: LayoutTests/animations/interpolation/flex-basis-interpolation.html

Issue 1265873002: Add test coverage for interpolations using CSS wide keywords and neutral keyframes (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: LayoutTests/animations/interpolation/flex-basis-interpolation.html
diff --git a/LayoutTests/animations/interpolation/flex-interpolation.html b/LayoutTests/animations/interpolation/flex-basis-interpolation.html
similarity index 50%
rename from LayoutTests/animations/interpolation/flex-interpolation.html
rename to LayoutTests/animations/interpolation/flex-basis-interpolation.html
index 153771d5bd0938a19cb142f7063a14584e160c3c..84fedccb3b81ddca3b36c1b5debe69c725f9ee11 100644
--- a/LayoutTests/animations/interpolation/flex-interpolation.html
+++ b/LayoutTests/animations/interpolation/flex-basis-interpolation.html
@@ -1,48 +1,54 @@
<!DOCTYPE html>
<meta charset="UTF-8">
<style>
-.target {
- height: 10px;
- background: black;
-}
-.filler {
- height: 10px;
- -webkit-flex: 1 1 50%;
- flex: 1 1 50%;
+.parent {
+ flex-basis: 3%;
}
-.expected {
- background: green;
-}
-.container {
- display: -webkit-flex;
- display: flex;
+.target {
+ flex-basis: 1%;
}
</style>
<body>
-<template id="target-template"><div class="container">
-<div class="target"></div>
-<div class="filler"></div>
-</div></template>
<script src="resources/interpolation-test.js"></script>
<script>
assertInterpolation({
- property: '-webkit-flex',
- from: '1 1 0%',
- to: '2 2 100%'
+ property: 'flex-basis',
+ from: '',
+ to: '2%',
}, [
- {at: -5, is: '0 0 0%'},
- {at: -0.3, is: '0.7 0.7 0%'},
- {at: 0, is: '1 1 0%'},
- {at: 0.3, is: '1.3 1.3 30%'},
- {at: 0.6, is: '1.6 1.6 60%'},
- {at: 1, is: '2 2 100%'},
- {at: 1.5, is: '2.5 2.5 150%'}
+ {at: -0.3, is: '0.7%'},
+ {at: 0, is: '1%'},
+ {at: 0.3, is: '1.3%'},
+ {at: 0.6, is: '1.6%'},
+ {at: 1, is: '2%'},
+ {at: 1.5, is: '2.5%'},
]);
+
assertNoInterpolation({
- property: '-webkit-flex',
- from: '0 0 100%',
- to: '1 1 100%'
+ property: 'flex-basis',
+ from: 'initial',
+ to: '2%',
+});
+
+assertInterpolation({
+ property: 'flex-basis',
+ from: 'inherit',
+ to: '2%',
+}, [
+ {at: -0.3, is: '3.3%'},
+ {at: 0, is: '3%'},
+ {at: 0.3, is: '2.7%'},
+ {at: 0.6, is: '2.4%'},
+ {at: 1, is: '2%'},
+ {at: 1.5, is: '1.5%'},
+]);
+
+assertNoInterpolation({
+ property: 'flex-basis',
+ from: 'unset',
+ to: '2%',
});
+
assertInterpolation({
property: 'flex-basis',
from: '0px',
@@ -55,6 +61,7 @@ assertInterpolation({
{at: 1, is: '100px'},
{at: 1.5, is: '150px'}
]);
+
assertInterpolation({
property: 'flex-basis',
from: '0%',

Powered by Google App Engine
This is Rietveld 408576698