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

Unified Diff: Source/core/animation/DoubleStyleInterpolation.cpp

Issue 1196913005: Implement animations for Independent CSS Transform Properties (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix rotate-interpolation test Created 5 years, 6 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 | « Source/core/animation/DoubleStyleInterpolation.h ('k') | Source/core/animation/KeyframeEffect.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/DoubleStyleInterpolation.cpp
diff --git a/Source/core/animation/DoubleStyleInterpolation.cpp b/Source/core/animation/DoubleStyleInterpolation.cpp
index b4eb68d700d47ec30f4ade3f7a31072d3b7a9998..75fee5638af16bfa5af805d1ae924a2f190f654a 100644
--- a/Source/core/animation/DoubleStyleInterpolation.cpp
+++ b/Source/core/animation/DoubleStyleInterpolation.cpp
@@ -27,39 +27,37 @@ PassOwnPtrWillBeRawPtr<InterpolableValue> DoubleStyleInterpolation::doubleToInte
return nullptr;
}
-PassRefPtrWillBeRawPtr<CSSValue> DoubleStyleInterpolation::interpolableValueToDouble(InterpolableValue* value, bool isNumber, InterpolationRange clamp)
+static double clampToRange(double value, InterpolationRange clamp)
{
- ASSERT(value->isNumber());
- double doubleValue = toInterpolableNumber(value)->value();
-
switch (clamp) {
case RangeAll:
// Do nothing
- break;
+ return value;
case RangeZeroToOne:
- doubleValue = clampTo<float>(doubleValue, 0, 1);
- break;
+ return clampTo<float>(value, 0, 1);
case RangeOpacityFIXME:
- doubleValue = clampTo<float>(doubleValue, 0, nextafterf(1, 0));
- break;
+ return clampTo<float>(value, 0, nextafterf(1, 0));
case RangeFloor:
- doubleValue = floor(doubleValue);
- break;
+ return floor(value);
case RangeRound:
- doubleValue = round(doubleValue);
- break;
+ return round(value);
case RangeRoundGreaterThanOrEqualToOne:
- doubleValue = clampTo<float>(round(doubleValue), 1);
- break;
+ return clampTo<float>(round(value), 1);
case RangeGreaterThanOrEqualToOne:
- doubleValue = clampTo<float>(doubleValue, 1);
- break;
+ return clampTo<float>(value, 1);
case RangeNonNegative:
- doubleValue = clampTo<float>(doubleValue, 0);
- break;
+ return clampTo<float>(value, 0);
default:
ASSERT_NOT_REACHED();
+ return value;
}
+}
+
+PassRefPtrWillBeRawPtr<CSSValue> DoubleStyleInterpolation::interpolableValueToDouble(const InterpolableValue* value, bool isNumber, InterpolationRange clamp)
+{
+ ASSERT(value->isNumber());
+ double doubleValue = clampToRange(toInterpolableNumber(value)->value(), clamp);
+
if (isNumber)
return CSSPrimitiveValue::create(doubleValue, CSSPrimitiveValue::CSS_NUMBER);
return CSSPrimitiveValue::create(doubleValue, CSSPrimitiveValue::CSS_DEG);
@@ -80,6 +78,17 @@ DEFINE_TRACE(DoubleStyleInterpolation)
StyleInterpolation::trace(visitor);
}
+PassOwnPtrWillBeRawPtr<InterpolableValue> DoubleStyleInterpolation::toInterpolableValue(const CSSValue& value, CSSPropertyID property)
+{
+ ASSERT(canCreateFrom(value));
+ return doubleToInterpolableValue(value);
+}
+
+PassRefPtrWillBeRawPtr<CSSValue> DoubleStyleInterpolation::fromInterpolableValue(const InterpolableValue& value, InterpolationRange range)
+{
+ return interpolableValueToDouble(&value, true, range);
+}
+
namespace {
bool extractMotionRotation(const CSSValue& value, float* rotation, MotionRotationType* rotationType)
« no previous file with comments | « Source/core/animation/DoubleStyleInterpolation.h ('k') | Source/core/animation/KeyframeEffect.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698