Commit 08a74429 authored by sashab@chromium.org's avatar sashab@chromium.org

Changed CSSPropertyObjectPosition to use legacy interpolation

Changed CSSPropertyObjectPosition back to use legacy interpolation, as
the new interpolation doesn't support interpolating between pairs and
pairs-of-pairs.

Suspected CL:
https://chromium.googlesource.com/chromium/blink/+/a3be631e4554bcf918ef17f31112a3f7d93f376d.

BUG=526738

Review URL: https://codereview.chromium.org/1325783004

git-svn-id: svn://svn.chromium.org/blink/trunk@201528 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent f558b05a
...@@ -129,5 +129,20 @@ assertInterpolation({ ...@@ -129,5 +129,20 @@ assertInterpolation({
{at: 1, is: '100% 0%'}, {at: 1, is: '100% 0%'},
{at: 1.5, is: '125% -25%'} {at: 1.5, is: '125% -25%'}
]); ]);
assertInterpolation({
property: 'object-position',
from: 'center',
to: 'right bottom 100%',
}, [
{at: -0.5, is: '25% 75%'},
{at: 0, is: 'center'},
{at: 0.3, is: '65% 35%'},
{at: 0.5, is: '75% 25%'},
{at: 0.9, is: '95% 5%'},
{at: 1, is: 'right bottom 100%'},
{at: 1.5, is: '125% -25%'},
{at: 2, is: '150% -50%'},
]);
</script> </script>
</body> </body>
...@@ -377,11 +377,8 @@ PassRefPtrWillBeRawPtr<Interpolation> StringKeyframe::CSSPropertySpecificKeyfram ...@@ -377,11 +377,8 @@ PassRefPtrWillBeRawPtr<Interpolation> StringKeyframe::CSSPropertySpecificKeyfram
case CSSPropertyBorderBottomRightRadius: case CSSPropertyBorderBottomRightRadius:
case CSSPropertyBorderTopLeftRadius: case CSSPropertyBorderTopLeftRadius:
case CSSPropertyBorderTopRightRadius: case CSSPropertyBorderTopRightRadius:
range = RangeNonNegative;
// Fall through
case CSSPropertyObjectPosition:
if (LengthPairStyleInterpolation::canCreateFrom(*fromCSSValue) && LengthPairStyleInterpolation::canCreateFrom(*toCSSValue)) if (LengthPairStyleInterpolation::canCreateFrom(*fromCSSValue) && LengthPairStyleInterpolation::canCreateFrom(*toCSSValue))
return LengthPairStyleInterpolation::create(*fromCSSValue, *toCSSValue, property, range); return LengthPairStyleInterpolation::create(*fromCSSValue, *toCSSValue, property, RangeNonNegative);
break; break;
case CSSPropertyPerspectiveOrigin: case CSSPropertyPerspectiveOrigin:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment