Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1154)

Unified Diff: third_party/WebKit/Source/core/animation/CSSOffsetRotationInterpolationType.cpp

Issue 2564703002: CSS Motion Path: Deprecate motion-* and offset-rotation (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/animation/CSSOffsetRotationInterpolationType.cpp
diff --git a/third_party/WebKit/Source/core/animation/CSSOffsetRotationInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSOffsetRotationInterpolationType.cpp
index 62dc968ecaf9911e4510acb5bb41ae63b184d7b5..e5c4ce8dd33c950562239f8acb8071eb095228a5 100644
--- a/third_party/WebKit/Source/core/animation/CSSOffsetRotationInterpolationType.cpp
+++ b/third_party/WebKit/Source/core/animation/CSSOffsetRotationInterpolationType.cpp
@@ -82,7 +82,7 @@ class InheritedRotationTypeChecker
OffsetRotationType m_inheritedRotationType;
};
-InterpolationValue convertOffsetRotation(const StyleOffsetRotation& rotation) {
+InterpolationValue convertOffsetRotate(const StyleOffsetRotation& rotation) {
return InterpolationValue(
InterpolableNumber::create(rotation.angle),
CSSOffsetRotationNonInterpolableValue::create(rotation.type));
@@ -98,13 +98,13 @@ InterpolationValue CSSOffsetRotationInterpolationType::maybeConvertNeutral(
.rotationType();
conversionCheckers.append(
UnderlyingRotationTypeChecker::create(underlyingRotationType));
- return convertOffsetRotation(StyleOffsetRotation(0, underlyingRotationType));
+ return convertOffsetRotate(StyleOffsetRotation(0, underlyingRotationType));
}
InterpolationValue CSSOffsetRotationInterpolationType::maybeConvertInitial(
const StyleResolverState&,
ConversionCheckers& conversionCheckers) const {
- return convertOffsetRotation(StyleOffsetRotation(0, OffsetRotationAuto));
+ return convertOffsetRotate(StyleOffsetRotation(0, OffsetRotationAuto));
}
InterpolationValue CSSOffsetRotationInterpolationType::maybeConvertInherit(
@@ -114,15 +114,14 @@ InterpolationValue CSSOffsetRotationInterpolationType::maybeConvertInherit(
state.parentStyle()->offsetRotation().type;
conversionCheckers.append(
InheritedRotationTypeChecker::create(inheritedRotationType));
- return convertOffsetRotation(state.parentStyle()->offsetRotation());
+ return convertOffsetRotate(state.parentStyle()->offsetRotation());
}
InterpolationValue CSSOffsetRotationInterpolationType::maybeConvertValue(
const CSSValue& value,
const StyleResolverState&,
ConversionCheckers&) const {
- return convertOffsetRotation(
- StyleBuilderConverter::convertOffsetRotation(value));
+ return convertOffsetRotate(StyleBuilderConverter::convertOffsetRotate(value));
}
PairwiseInterpolationValue
@@ -145,7 +144,7 @@ CSSOffsetRotationInterpolationType::maybeMergeSingles(
InterpolationValue
CSSOffsetRotationInterpolationType::maybeConvertUnderlyingValue(
const InterpolationEnvironment& environment) const {
- return convertOffsetRotation(environment.state().style()->offsetRotation());
+ return convertOffsetRotate(environment.state().style()->offsetRotation());
}
void CSSOffsetRotationInterpolationType::composite(

Powered by Google App Engine
This is Rietveld 408576698