| Index: Source/core/animation/css/CSSAnimations.cpp
|
| diff --git a/Source/core/animation/css/CSSAnimations.cpp b/Source/core/animation/css/CSSAnimations.cpp
|
| index 05e358ec61969f59c4af125a4e8dfe9f9c886dc3..f4fe40ba2a440fd3993f02208c603e2cb2d8626d 100644
|
| --- a/Source/core/animation/css/CSSAnimations.cpp
|
| +++ b/Source/core/animation/css/CSSAnimations.cpp
|
| @@ -236,7 +236,7 @@ void CSSAnimations::calculateAnimationUpdate(CSSAnimationUpdate* update, Element
|
| {
|
| const ActiveAnimations* activeAnimations = element ? element->activeAnimations() : 0;
|
|
|
| -#if !ASSERT_ENABLED
|
| +#if !ENABLE(ASSERT)
|
| // If we're in an animation style change, no animations can have started, been cancelled or changed play state.
|
| // When ASSERT is enabled, we verify this optimization.
|
| if (activeAnimations && activeAnimations->isAnimationStyleChange())
|
| @@ -460,7 +460,7 @@ void CSSAnimations::calculateTransitionUpdate(CSSAnimationUpdate* update, const
|
| const TransitionMap* activeTransitions = activeAnimations ? &activeAnimations->cssAnimations().m_transitions : 0;
|
| const CSSTransitionData* transitionData = style.transitions();
|
|
|
| -#if ASSERT_ENABLED
|
| +#if ENABLE(ASSERT)
|
| // In debug builds we verify that it would have been safe to avoid populating and testing listedProperties if the style recalc is due to animation.
|
| const bool animationStyleRecalc = false;
|
| #else
|
|
|