| Index: third_party/WebKit/Source/core/animation/SizeInterpolationFunctions.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/SizeInterpolationFunctions.cpp b/third_party/WebKit/Source/core/animation/SizeInterpolationFunctions.cpp
|
| index 505ab0c45ef1c35cf7ca8ff82442de5979222ecb..8cc10cab87facf6ea5285c5b7b541eef9ac5d7c1 100644
|
| --- a/third_party/WebKit/Source/core/animation/SizeInterpolationFunctions.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/SizeInterpolationFunctions.cpp
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "core/animation/LengthInterpolationFunctions.h"
|
| #include "core/animation/UnderlyingValueOwner.h"
|
| +#include "core/css/CSSIdentifierValue.h"
|
| #include "core/css/CSSToLengthConversionData.h"
|
| #include "core/css/CSSValuePair.h"
|
|
|
| @@ -90,14 +91,14 @@ InterpolationValue SizeInterpolationFunctions::maybeConvertCSSSizeSide(const CSS
|
| if (value.isValuePair()) {
|
| const CSSValuePair& pair = toCSSValuePair(value);
|
| const CSSValue& side = convertWidth ? pair.first() : pair.second();
|
| - if (side.isPrimitiveValue() && toCSSPrimitiveValue(side).getValueID() == CSSValueAuto)
|
| + if (side.isIdentifierValue() && toCSSIdentifierValue(side).getValueID() == CSSValueAuto)
|
| return convertKeyword(CSSValueAuto);
|
| return wrapConvertedLength(LengthInterpolationFunctions::maybeConvertCSSValue(side));
|
| }
|
|
|
| if (!value.isPrimitiveValue())
|
| return nullptr;
|
| - CSSValueID keyword = toCSSPrimitiveValue(value).getValueID();
|
| + CSSValueID keyword = toCSSIdentifierValue(value).getValueID();
|
| if (keyword)
|
| return convertKeyword(keyword);
|
|
|
|
|