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

Unified Diff: Source/core/rendering/RenderObject.cpp

Issue 22364002: Web Animations: Address some review feedback to clean up CSS Animations (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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/css/resolver/StyleResolver.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderObject.cpp
diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp
index 0f4c612176bd04b54942a2d4676e0b50f6421809..eb5cacbcd9c695c1c8935a272171e081945fd644 100644
--- a/Source/core/rendering/RenderObject.cpp
+++ b/Source/core/rendering/RenderObject.cpp
@@ -1735,17 +1735,17 @@ void RenderObject::handleDynamicFloatPositionChange()
void RenderObject::setAnimatableStyle(PassRefPtr<RenderStyle> style)
{
if (!isText() && style) {
- if (RuntimeEnabledFeatures::webAnimationsCSSEnabled() && node() && node()->isElementNode()) {
+ if (!RuntimeEnabledFeatures::webAnimationsCSSEnabled()) {
+ setStyle(animation()->updateAnimations(this, style.get()));
+ return;
+ }
+ if (node() && node()->isElementNode()) {
Element* element = toElement(node());
if (CSSAnimations::needsUpdate(element, style.get()))
element->ensureActiveAnimations()->cssAnimations()->update(element, style.get());
- setStyle(style);
- } else {
- setStyle(animation()->updateAnimations(this, style.get()));
}
- } else {
- setStyle(style);
}
+ setStyle(style);
}
StyleDifference RenderObject::adjustStyleDifference(StyleDifference diff, unsigned contextSensitiveProperties) const
« no previous file with comments | « Source/core/css/resolver/StyleResolver.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698