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

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

Issue 2617453003: Make CSSInterpolationType::maybeConvertSingle() final (Closed)
Patch Set: No lambdas Created 3 years, 12 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
Index: third_party/WebKit/Source/core/animation/CSSInterpolationType.cpp
diff --git a/third_party/WebKit/Source/core/animation/CSSInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSInterpolationType.cpp
index c784cebba06f25f30835b42dbad2efbce10e656e..0aa388db0bf3dca304d164fae5093570908ffe4c 100644
--- a/third_party/WebKit/Source/core/animation/CSSInterpolationType.cpp
+++ b/third_party/WebKit/Source/core/animation/CSSInterpolationType.cpp
@@ -60,6 +60,21 @@ InterpolationValue CSSInterpolationType::maybeConvertSingle(
const InterpolationEnvironment& environment,
const InterpolationValue& underlying,
ConversionCheckers& conversionCheckers) const {
+ InterpolationValue result = maybeConvertSingleInternal(
+ keyframe, environment, underlying, conversionCheckers);
+ if (result &&
+ keyframe.composite() !=
+ EffectModel::CompositeOperation::CompositeReplace) {
+ additiveKeyframeHook(result);
+ }
+ return result;
+}
+
+InterpolationValue CSSInterpolationType::maybeConvertSingleInternal(
+ const PropertySpecificKeyframe& keyframe,
+ const InterpolationEnvironment& environment,
+ const InterpolationValue& underlying,
+ ConversionCheckers& conversionCheckers) const {
const CSSValue* value = toCSSPropertySpecificKeyframe(keyframe).value();
if (!value)

Powered by Google App Engine
This is Rietveld 408576698