| 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
|
|
|