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

Unified Diff: Source/core/animation/css/CSSAnimatableValueFactory.cpp

Issue 1300323003: Make flex-grow and flex-shrink interpolation continuous with 0 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Update test Created 5 years, 4 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/css/CSSAnimatableValueFactory.cpp
diff --git a/Source/core/animation/css/CSSAnimatableValueFactory.cpp b/Source/core/animation/css/CSSAnimatableValueFactory.cpp
index ae7c1ff97b7d370ed4ec7444ba718d48590ee98b..52521bdf520a1e70cb2f2a267371ca85d21d6d91 100644
--- a/Source/core/animation/css/CSSAnimatableValueFactory.cpp
+++ b/Source/core/animation/css/CSSAnimatableValueFactory.cpp
@@ -112,9 +112,9 @@ static PassRefPtrWillBeRawPtr<AnimatableValue> createFromLineHeight(const Length
return createFromLength(length, style);
}
-inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromDouble(double value, AnimatableDouble::Constraint constraint = AnimatableDouble::Unconstrained)
+inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromDouble(double value)
{
- return AnimatableDouble::create(value, constraint);
+ return AnimatableDouble::create(value);
}
inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromLengthBox(const LengthBox& lengthBox, const ComputedStyle& style)
@@ -379,9 +379,9 @@ PassRefPtrWillBeRawPtr<AnimatableValue> CSSAnimatableValueFactory::create(CSSPro
style.svgStyle().fillPaintColor(), style.svgStyle().visitedLinkFillPaintColor(),
style.svgStyle().fillPaintUri(), style.svgStyle().visitedLinkFillPaintUri());
case CSSPropertyFlexGrow:
- return createFromDouble(style.flexGrow(), AnimatableDouble::InterpolationIsNonContinuousWithZero);
+ return createFromDouble(style.flexGrow());
case CSSPropertyFlexShrink:
- return createFromDouble(style.flexShrink(), AnimatableDouble::InterpolationIsNonContinuousWithZero);
+ return createFromDouble(style.flexShrink());
case CSSPropertyFlexBasis:
return createFromLength(style.flexBasis(), style);
case CSSPropertyFloodColor:
@@ -518,7 +518,9 @@ PassRefPtrWillBeRawPtr<AnimatableValue> CSSAnimatableValueFactory::create(CSSPro
case CSSPropertyWebkitMaskSize:
return createFromFillLayers<CSSPropertyWebkitMaskSize>(style.maskLayers(), style);
case CSSPropertyPerspective:
- return createFromDouble(style.perspective(), AnimatableDouble::InterpolationIsNonContinuousWithZero);
+ if (style.perspective() == 0)
+ return AnimatableUnknown::create(CSSPrimitiveValue::createIdentifier(CSSValueNone));
+ return createFromDouble(style.perspective());
case CSSPropertyPerspectiveOrigin:
return createFromLengthPoint(style.perspectiveOrigin(), style);
case CSSPropertyShapeOutside:
« no previous file with comments | « Source/core/animation/animatable/AnimatableDouble.cpp ('k') | Source/core/css/resolver/AnimatedStyleBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698