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

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

Issue 22707006: Web Animations CSS: Assert underlying value is not used (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Review changes Created 7 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
« no previous file with comments | « Source/core/animation/KeyframeAnimationEffectTest.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 996285ae47ae034b75e0ec582de59633b31ed04c..d8e32420200e9086117f0f89be5e3eee6af0eeea 100644
--- a/Source/core/css/resolver/StyleResolver.cpp
+++ b/Source/core/css/resolver/StyleResolver.cpp
@@ -1162,7 +1162,8 @@ void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const Ele
CSSPropertyID property = iter->key;
if (!isPropertyForPass<pass>(property))
continue;
- RefPtr<AnimatableValue> animatableValue = iter->value->compositeOnto(AnimatableValue::neutralValue());
+ 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());
else
« no previous file with comments | « Source/core/animation/KeyframeAnimationEffectTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698