| Index: third_party/WebKit/Source/core/animation/CSSOffsetRotateInterpolationType.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/CSSOffsetRotateInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSOffsetRotateInterpolationType.cpp
|
| index 4a8b2762fb2aedcba2f0666e2036d593a62ba7e7..417b5c138acdfab13cf38d982b34740b1016b8fd 100644
|
| --- a/third_party/WebKit/Source/core/animation/CSSOffsetRotateInterpolationType.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/CSSOffsetRotateInterpolationType.cpp
|
| @@ -37,7 +37,7 @@ DEFINE_NON_INTERPOLABLE_VALUE_TYPE_CASTS(CSSOffsetRotationNonInterpolableValue);
|
| namespace {
|
|
|
| class UnderlyingRotationTypeChecker
|
| - : public InterpolationType::ConversionChecker {
|
| + : public CSSInterpolationType::CSSConversionChecker {
|
| public:
|
| static std::unique_ptr<UnderlyingRotationTypeChecker> Create(
|
| OffsetRotationType underlying_rotation_type) {
|
| @@ -45,7 +45,7 @@ class UnderlyingRotationTypeChecker
|
| new UnderlyingRotationTypeChecker(underlying_rotation_type));
|
| }
|
|
|
| - bool IsValid(const InterpolationEnvironment&,
|
| + bool IsValid(const StyleResolverState&,
|
| const InterpolationValue& underlying) const final {
|
| return underlying_rotation_type_ == ToCSSOffsetRotationNonInterpolableValue(
|
| *underlying.non_interpolable_value)
|
| @@ -60,7 +60,7 @@ class UnderlyingRotationTypeChecker
|
| };
|
|
|
| class InheritedRotationTypeChecker
|
| - : public InterpolationType::ConversionChecker {
|
| + : public CSSInterpolationType::CSSConversionChecker {
|
| public:
|
| static std::unique_ptr<InheritedRotationTypeChecker> Create(
|
| OffsetRotationType inherited_rotation_type) {
|
| @@ -68,10 +68,9 @@ class InheritedRotationTypeChecker
|
| new InheritedRotationTypeChecker(inherited_rotation_type));
|
| }
|
|
|
| - bool IsValid(const InterpolationEnvironment& environment,
|
| + bool IsValid(const StyleResolverState& state,
|
| const InterpolationValue& underlying) const final {
|
| - return inherited_rotation_type_ ==
|
| - environment.GetState().ParentStyle()->OffsetRotate().type;
|
| + return inherited_rotation_type_ == state.ParentStyle()->OffsetRotate().type;
|
| }
|
|
|
| private:
|
|
|