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

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

Issue 19367002: Implement DeferredAnimatableValue (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rename class Created 7 years, 5 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
« Source/core/animation/DeferredAnimatableValue.h ('K') | « Source/core/core.gypi ('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 4adccec5c54896cc3d473bc43df7c272289b8b62..3432b192c9f64331e25a23ae38083759bccd1f33 100644
--- a/Source/core/css/resolver/StyleResolver.cpp
+++ b/Source/core/css/resolver/StyleResolver.cpp
@@ -997,11 +997,14 @@ void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const Ele
CSSPropertyID property = iter->key;
if (!isPropertyForPass<pass>(property))
continue;
- RefPtr<CSSValue> value = iter->value->compositeOnto(AnimatableValue::neutralValue())->toCSSValue();
+ RefPtr<AnimatableValue> animatableValue = iter->value->compositeOnto(AnimatableValue::neutralValue());
+ if (animatableValue->isDeferredSnapshot())
+ continue;
+ RefPtr<CSSValue> cssValue = animatableValue->toCSSValue();
if (pass == HighPriorityProperties && property == CSSPropertyLineHeight)
- state.setLineHeightValue(value.get());
+ state.setLineHeightValue(cssValue.get());
else
- applyProperty(state, property, value.get());
+ applyProperty(state, property, cssValue.get());
}
}
}
« Source/core/animation/DeferredAnimatableValue.h ('K') | « Source/core/core.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698