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

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

Issue 2617453003: Make CSSInterpolationType::maybeConvertSingle() final (Closed)
Patch Set: No lambdas Created 3 years, 11 months 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
« no previous file with comments | « third_party/WebKit/Source/core/animation/CSSTransformInterpolationType.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/animation/CSSTransformInterpolationType.cpp
diff --git a/third_party/WebKit/Source/core/animation/CSSTransformInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSTransformInterpolationType.cpp
index f6ebc4bba2fd0fe80b3e8f57c47638a84f7cb24b..8e7fc5d24d75e5060c3dbdd4bc7ca372d63c8f4f 100644
--- a/third_party/WebKit/Source/core/animation/CSSTransformInterpolationType.cpp
+++ b/third_party/WebKit/Source/core/animation/CSSTransformInterpolationType.cpp
@@ -206,19 +206,10 @@ InterpolationValue CSSTransformInterpolationType::maybeConvertValue(
return convertTransform(std::move(transform));
}
-InterpolationValue CSSTransformInterpolationType::maybeConvertSingle(
- const PropertySpecificKeyframe& keyframe,
- const InterpolationEnvironment& environment,
- const InterpolationValue& underlying,
- ConversionCheckers& conversionCheckers) const {
- InterpolationValue result = CSSInterpolationType::maybeConvertSingle(
- keyframe, environment, underlying, conversionCheckers);
- if (!result)
- return nullptr;
- if (keyframe.composite() != EffectModel::CompositeReplace)
- toCSSTransformNonInterpolableValue(*result.nonInterpolableValue)
- .setSingleAdditive();
- return result;
+void CSSTransformInterpolationType::additiveKeyframeHook(
+ InterpolationValue& value) const {
+ toCSSTransformNonInterpolableValue(*value.nonInterpolableValue)
+ .setSingleAdditive();
}
PairwiseInterpolationValue CSSTransformInterpolationType::maybeMergeSingles(
« no previous file with comments | « third_party/WebKit/Source/core/animation/CSSTransformInterpolationType.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698