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

Unified Diff: Source/core/css/resolver/StyleResolver.cpp

Issue 25082007: Web Animations CSS: Split AnimatableNumber into AnimatableDouble and AnimatableLength (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Review changes Created 7 years, 2 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/css/resolver/AnimatedStyleBuilder.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/StyleResolver.cpp
diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
index 219d608bddcff3c1d9044a444172bcfd78d09864..8e7703b03cda737bcb33291768986aa90a6be5f0 100644
--- a/Source/core/css/resolver/StyleResolver.cpp
+++ b/Source/core/css/resolver/StyleResolver.cpp
@@ -33,7 +33,7 @@
#include "HTMLNames.h"
#include "RuntimeEnabledFeatures.h"
#include "StylePropertyShorthand.h"
-#include "core/animation/AnimatableNumber.h"
+#include "core/animation/AnimatableLength.h"
#include "core/animation/AnimatableValue.h"
#include "core/animation/Animation.h"
#include "core/animation/DocumentTimeline.h"
@@ -1257,7 +1257,7 @@ bool StyleResolver::applyAnimatedProperties(StyleResolverState& state, const Doc
RELEASE_ASSERT_WITH_MESSAGE(!iter->value->dependsOnUnderlyingValue(), "Not yet implemented: An interface for compositing onto the underlying value.");
RefPtr<AnimatableValue> animatableValue = iter->value->compositeOnto(0);
if (pass == HighPriorityProperties && property == CSSPropertyLineHeight)
- state.setLineHeightValue(toAnimatableNumber(animatableValue.get())->toCSSValue().get());
+ state.setLineHeightValue(toAnimatableLength(animatableValue.get())->toCSSValue().get());
else
AnimatedStyleBuilder::applyProperty(property, state, animatableValue.get());
didApply = true;
@@ -1284,7 +1284,7 @@ bool StyleResolver::applyAnimatedProperties(StyleResolverState& state, const Doc
continue;
RefPtr<AnimatableValue> animatableValue = iter->value->compositeOnto(AnimatableValue::neutralValue());
if (pass == HighPriorityProperties && property == CSSPropertyLineHeight)
- state.setLineHeightValue(toAnimatableNumber(animatableValue.get())->toCSSValue().get());
+ state.setLineHeightValue(toAnimatableLength(animatableValue.get())->toCSSValue().get());
else
AnimatedStyleBuilder::applyProperty(property, state, animatableValue.get());
didApply = true;
« no previous file with comments | « Source/core/css/resolver/AnimatedStyleBuilder.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698