| Index: third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp
|
| index 454058907d805f55f1897325e64e3db96a843485..440b2b955a9ce79854ff33bf86b510cbfd0bf5bb 100644
|
| --- a/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp
|
| @@ -8,6 +8,7 @@
|
| #include "core/animation/LengthPropertyFunctions.h"
|
| #include "core/animation/css/CSSAnimatableValueFactory.h"
|
| #include "core/css/CSSCalculationValue.h"
|
| +#include "core/css/CSSIdentifierValue.h"
|
| #include "core/css/resolver/StyleBuilder.h"
|
| #include "core/css/resolver/StyleResolverState.h"
|
| #include "platform/LengthFunctions.h"
|
| @@ -86,8 +87,8 @@ InterpolationValue CSSLengthInterpolationType::maybeConvertValue(
|
| const CSSValue& value,
|
| const StyleResolverState&,
|
| ConversionCheckers& conversionCheckers) const {
|
| - if (value.isPrimitiveValue() && toCSSPrimitiveValue(value).isValueID()) {
|
| - CSSValueID valueID = toCSSPrimitiveValue(value).getValueID();
|
| + if (value.isIdentifierValue()) {
|
| + CSSValueID valueID = toCSSIdentifierValue(value).getValueID();
|
| double pixels;
|
| if (!LengthPropertyFunctions::getPixelsForKeyword(cssProperty(), valueID,
|
| pixels))
|
| @@ -146,7 +147,7 @@ void CSSLengthInterpolationType::apply(
|
| Length after;
|
| DCHECK(LengthPropertyFunctions::getLength(cssProperty(), style, before));
|
| StyleBuilder::applyProperty(cssProperty(), state,
|
| - *CSSPrimitiveValue::create(length, zoom));
|
| + *CSSValue::create(length, zoom));
|
| DCHECK(LengthPropertyFunctions::getLength(cssProperty(), style, after));
|
| DCHECK_EQ(before.type(), after.type());
|
| if (before.isSpecified()) {
|
| @@ -159,7 +160,7 @@ void CSSLengthInterpolationType::apply(
|
| return;
|
| }
|
| StyleBuilder::applyProperty(cssProperty(), state,
|
| - *CSSPrimitiveValue::create(length, zoom));
|
| + *CSSValue::create(length, zoom));
|
| }
|
|
|
| } // namespace blink
|
|
|