| 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 13e7e128b44b175b0e5750098295f50bd1dd5d4f..4a8b2762fb2aedcba2f0666e2036d593a62ba7e7 100644
|
| --- a/third_party/WebKit/Source/core/animation/CSSOffsetRotateInterpolationType.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/CSSOffsetRotateInterpolationType.cpp
|
| @@ -71,7 +71,7 @@ class InheritedRotationTypeChecker
|
| bool IsValid(const InterpolationEnvironment& environment,
|
| const InterpolationValue& underlying) const final {
|
| return inherited_rotation_type_ ==
|
| - environment.GetState().ParentStyle()->OffsetRotation().type;
|
| + environment.GetState().ParentStyle()->OffsetRotate().type;
|
| }
|
|
|
| private:
|
| @@ -111,10 +111,10 @@ InterpolationValue CSSOffsetRotateInterpolationType::MaybeConvertInherit(
|
| const StyleResolverState& state,
|
| ConversionCheckers& conversion_checkers) const {
|
| OffsetRotationType inherited_rotation_type =
|
| - state.ParentStyle()->OffsetRotation().type;
|
| + state.ParentStyle()->OffsetRotate().type;
|
| conversion_checkers.push_back(
|
| InheritedRotationTypeChecker::Create(inherited_rotation_type));
|
| - return ConvertOffsetRotate(state.ParentStyle()->OffsetRotation());
|
| + return ConvertOffsetRotate(state.ParentStyle()->OffsetRotate());
|
| }
|
|
|
| InterpolationValue CSSOffsetRotateInterpolationType::MaybeConvertValue(
|
| @@ -143,7 +143,7 @@ PairwiseInterpolationValue CSSOffsetRotateInterpolationType::MaybeMergeSingles(
|
| InterpolationValue
|
| CSSOffsetRotateInterpolationType::MaybeConvertStandardPropertyUnderlyingValue(
|
| const ComputedStyle& style) const {
|
| - return ConvertOffsetRotate(style.OffsetRotation());
|
| + return ConvertOffsetRotate(style.OffsetRotate());
|
| }
|
|
|
| void CSSOffsetRotateInterpolationType::Composite(
|
| @@ -170,7 +170,7 @@ void CSSOffsetRotateInterpolationType::ApplyStandardPropertyValue(
|
| const InterpolableValue& interpolable_value,
|
| const NonInterpolableValue* non_interpolable_value,
|
| StyleResolverState& state) const {
|
| - state.Style()->SetOffsetRotation(StyleOffsetRotation(
|
| + state.Style()->SetOffsetRotate(StyleOffsetRotation(
|
| ToInterpolableNumber(interpolable_value).Value(),
|
| ToCSSOffsetRotationNonInterpolableValue(*non_interpolable_value)
|
| .RotationType()));
|
|
|