Index: LayoutTests/animations/interpolation/webkit-mask-size-interpolation.html |
diff --git a/LayoutTests/animations/interpolation/webkit-mask-size-interpolation.html b/LayoutTests/animations/interpolation/webkit-mask-size-interpolation.html |
index 2b7825d231358921c36e72fafc0bca1d8b84bce0..0e6bae1da70f31e9839339112f2250e00fd88eea 100644 |
--- a/LayoutTests/animations/interpolation/webkit-mask-size-interpolation.html |
+++ b/LayoutTests/animations/interpolation/webkit-mask-size-interpolation.html |
@@ -1,64 +1,83 @@ |
<!DOCTYPE html> |
<meta charset="UTF-8"> |
<style> |
-/*.target { |
- width: 80px; |
- height: 100px; |
- display: inline-block; |
- border: 2px solid black; |
- -webkit-mask-repeat: no-repeat; |
- -webkit-mask-image: url(../resources/stripes-100.png), |
- url(../resources/stripes-100.png), |
- url(../resources/blue-100.png), |
- url(../resources/green-100.png); |
- -webkit-mask-position: left top, right top, left bottom, right bottom; |
+.parent { |
+ -webkit-mask-size: 30px; |
} |
-*/ |
-.wrapper { |
- border: 10px solid black; |
+.target { |
width: 100px; |
height: 100px; |
display: inline-block; |
- margin-bottom: 10px; |
-} |
-.wrapper:nth-child(2n) { |
- border-color: green; |
-} |
-.target { |
- background-color: blue; |
+ background-color: black; |
-webkit-mask-repeat: no-repeat; |
-webkit-mask-image: url(../resources/blue-100.png), |
- url(../resources/green-100.png), |
- url(../resources/stripes-100.png), |
- url(../resources/stripes-100.png); |
- -webkit-mask-position: left top, right top, left bottom, right bottom; |
- height: 100%; |
+ url(../resources/stripes-100.png), |
+ url(../resources/stripes-100.png), |
+ url(../resources/green-100.png); |
+ -webkit-mask-position: 20% 20%, 20% 80%, 80% 20%, 80% 80%; |
+ -webkit-mask-size: 10px; |
+ margin-bottom: 100px; |
+} |
+.expected { |
+ background-color: green; |
+ margin-right: 100px; |
} |
</style> |
<body> |
-<template id="target-template"> |
- <div class="wrapper"> |
- <div class="target"></div> |
- </div> |
-</template> |
<script src="resources/interpolation-test.js"></script> |
<script> |
+assertInterpolation({ |
+ property: '-webkit-mask-size', |
+ from: '', |
+ to: '20px', |
+}, [ |
+ {at: -0.25, is: '7.5px, 7.5px, 7.5px, 7.5px'}, |
+ {at: 0, is: '10px, 10px, 10px, 10px'}, |
+ {at: 0.25, is: '12.5px, 12.5px, 12.5px, 12.5px'}, |
+ {at: 0.5, is: '15px, 15px, 15px, 15px'}, |
+ {at: 0.75, is: '17.5px, 17.5px, 17.5px, 17.5px'}, |
+ {at: 1, is: '20px, 20px, 20px, 20px'}, |
+ {at: 1.25, is: '22.5px, 22.5px, 22.5px, 22.5px'}, |
+]); |
+ |
+assertNoInterpolation({ |
+ property: '-webkit-mask-size', |
+ from: 'initial', |
+ to: '20px', |
+}); |
+ |
+assertInterpolation({ |
+ property: '-webkit-mask-size', |
+ from: 'inherit', |
+ to: '20px', |
+}, [ |
+ {at: -0.25, is: '32.5px, 32.5px, 32.5px, 32.5px'}, |
+ {at: 0, is: '30px, 30px, 30px, 30px'}, |
+ {at: 0.25, is: '27.5px, 27.5px, 27.5px, 27.5px'}, |
+ {at: 0.5, is: '25px, 25px, 25px, 25px'}, |
+ {at: 0.75, is: '22.5px, 22.5px, 22.5px, 22.5px'}, |
+ {at: 1, is: '20px, 20px, 20px, 20px'}, |
+ {at: 1.25, is: '17.5px, 17.5px, 17.5px, 17.5px'}, |
+]); |
+ |
+assertNoInterpolation({ |
+ property: '-webkit-mask-size', |
+ from: 'unset', |
+ to: '20px', |
+}); |
+ |
// Matched keywords in size value list. |
-var from = '0px 0px, 0px 0px, contain, cover'; |
-var to = '20px 20px, 20px 20px, contain, cover'; |
assertNoInterpolation({ |
property: '-webkit-mask-size', |
- from: from, |
- to: to, |
+ from: '0px 0px, 0px 0px, contain, cover', |
+ to: '20px 20px, 20px 20px, contain, cover', |
}); |
// Mismatched keywords in size value list. |
-from = '0px 0px, 0px 0px, contain, cover'; |
-to = '20px 20px, 20px 20px, cover, contain'; |
assertNoInterpolation({ |
property: '-webkit-mask-size', |
- from: from, |
- to: to, |
+ from: '0px 0px, 0px 0px, contain, cover', |
+ to: '20px 20px, 20px 20px, cover, contain', |
}); |
// Equal number of size values as mask images. |