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

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

Issue 1248093002: Move interpolated Length unit types out of InterpolableValue into NonInterpolableValue (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase again Created 5 years, 3 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/InterpolationValue.h ('k') | Source/core/animation/LengthInterpolationType.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/LengthInterpolationType.h
diff --git a/Source/core/animation/LengthInterpolationType.h b/Source/core/animation/LengthInterpolationType.h
index 64bb35204e07624dc496d1599d4ef871e6910a05..be39e037bd67364583dc154405df309b4047c971 100644
--- a/Source/core/animation/LengthInterpolationType.h
+++ b/Source/core/animation/LengthInterpolationType.h
@@ -17,6 +17,7 @@ public:
LengthInterpolationType(CSSPropertyID);
PassOwnPtr<InterpolationValue> maybeConvertUnderlyingValue(const StyleResolverState&) const final;
+ void composite(UnderlyingValue&, double underlyingFraction, const InterpolationValue&) const final;
void apply(const InterpolableValue&, const NonInterpolableValue*, StyleResolverState&) const final;
private:
@@ -28,6 +29,8 @@ private:
PassOwnPtr<InterpolationValue> maybeConvertInherit(const StyleResolverState*, ConversionCheckers&) const final;
PassOwnPtr<InterpolationValue> maybeConvertValue(const CSSValue&, const StyleResolverState*, ConversionCheckers&) const final;
+ PassOwnPtr<PairwisePrimitiveInterpolation> mergeSingleConversions(InterpolationValue&, InterpolationValue&) const final;
+
const ValueRange m_valueRange;
};
« no previous file with comments | « Source/core/animation/InterpolationValue.h ('k') | Source/core/animation/LengthInterpolationType.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698