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

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

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
Index: Source/core/animation/DoubleStyleInterpolation.h
diff --git a/Source/core/animation/DoubleStyleInterpolation.h b/Source/core/animation/DoubleStyleInterpolation.h
index 7ac03f51b0297b51c982681a9296916d7048c2fa..2a493bcc17fa45670e6b8b3f1bfb53f20ce1a435 100644
--- a/Source/core/animation/DoubleStyleInterpolation.h
+++ b/Source/core/animation/DoubleStyleInterpolation.h
@@ -13,6 +13,8 @@ namespace blink {
class CORE_EXPORT DoubleStyleInterpolation : public StyleInterpolation {
public:
+ typedef void NonInterpolableType;
+
static PassRefPtrWillBeRawPtr<DoubleStyleInterpolation> create(const CSSValue& start, const CSSValue& end, CSSPropertyID id, CSSPrimitiveValue::UnitType type, InterpolationRange clamp)
{
return adoptRefWillBeNoop(new DoubleStyleInterpolation(doubleToInterpolableValue(start), doubleToInterpolableValue(end), id, type == CSSPrimitiveValue::CSS_NUMBER, clamp, false));
@@ -26,6 +28,9 @@ public:
DECLARE_VIRTUAL_TRACE();
+ static PassOwnPtrWillBeRawPtr<InterpolableValue> toInterpolableValue(const CSSValue&, CSSPropertyID = CSSPropertyInvalid);
+ static PassRefPtrWillBeRawPtr<CSSValue> fromInterpolableValue(const InterpolableValue&, InterpolationRange);
+
private:
DoubleStyleInterpolation(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end, CSSPropertyID id, bool isNumber, InterpolationRange clamp, bool flag)
: StyleInterpolation(start, end, id)
@@ -37,7 +42,7 @@ private:
static PassOwnPtrWillBeRawPtr<InterpolableValue> doubleToInterpolableValue(const CSSValue&);
static PassOwnPtrWillBeRawPtr<InterpolableValue> motionRotationToInterpolableValue(const CSSValue&);
- static PassRefPtrWillBeRawPtr<CSSValue> interpolableValueToDouble(InterpolableValue*, bool, InterpolationRange);
+ static PassRefPtrWillBeRawPtr<CSSValue> interpolableValueToDouble(const InterpolableValue*, bool, InterpolationRange);
static PassRefPtrWillBeRawPtr<CSSValue> interpolableValueToMotionRotation(InterpolableValue*, bool);
bool m_isNumber;

Powered by Google App Engine
This is Rietveld 408576698