| Index: Source/core/dom/Element.cpp
|
| diff --git a/Source/core/dom/Element.cpp b/Source/core/dom/Element.cpp
|
| index 36485390723f6e64708292b3bc8c29698978ce23..1dec7bd36ca948ff5c4ae4e393a9308081ff5cbc 100644
|
| --- a/Source/core/dom/Element.cpp
|
| +++ b/Source/core/dom/Element.cpp
|
| @@ -1534,6 +1534,11 @@ void Element::recalcStyle(StyleRecalcChange change, Text* nextTextSibling)
|
| ElementRareData* data = elementRareData();
|
| data->resetStyleState();
|
| data->clearComputedStyle();
|
| +
|
| + if (change >= Inherit) {
|
| + if (ActiveAnimations* activeAnimations = data->activeAnimations())
|
| + activeAnimations->setAnimationStyleChange(false);
|
| + }
|
| }
|
| if (parentRenderStyle())
|
| change = recalcOwnStyle(change);
|
| @@ -1723,6 +1728,21 @@ void Element::didAffectSelector(AffectedSelectorMask mask)
|
| elementShadow->didAffectSelector(mask);
|
| }
|
|
|
| +void Element::setAnimationStyleChange(bool animationStyleChange)
|
| +{
|
| + if (ActiveAnimations* activeAnimations = elementRareData()->activeAnimations())
|
| + activeAnimations->setAnimationStyleChange(animationStyleChange);
|
| +}
|
| +
|
| +void Element::setNeedsAnimationStyleRecalc()
|
| +{
|
| + if (styleChangeType() != NoStyleChange)
|
| + return;
|
| +
|
| + setNeedsStyleRecalc(LocalStyleChange, StyleChangeFromRenderer);
|
| + setAnimationStyleChange(true);
|
| +}
|
| +
|
| PassRefPtr<ShadowRoot> Element::createShadowRoot(ExceptionState& exceptionState)
|
| {
|
| if (alwaysCreateUserAgentShadowRoot())
|
|
|