| Index: third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp b/third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp
|
| index 31429e97eb6e78b54b51257c5c669aad71aa284c..abcc1f056f2e9e8dc1a58f923115f325749b8bd5 100644
|
| --- a/third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp
|
| @@ -861,13 +861,13 @@ void CSSAnimations::calculateAnimationActiveInterpolations(
|
| const Element* animatingElement) {
|
| ElementAnimations* elementAnimations =
|
| animatingElement ? animatingElement->elementAnimations() : nullptr;
|
| - AnimationStack* animationStack =
|
| + EffectStack* animationStack =
|
| elementAnimations ? &elementAnimations->animationStack() : nullptr;
|
|
|
| if (update.newAnimations().isEmpty() &&
|
| update.suppressedAnimations().isEmpty()) {
|
| ActiveInterpolationsMap activeInterpolationsForAnimations(
|
| - AnimationStack::activeInterpolations(
|
| + EffectStack::activeInterpolations(
|
| animationStack, nullptr, nullptr,
|
| KeyframeEffectReadOnly::DefaultPriority, isStylePropertyHandle));
|
| update.adoptActiveInterpolationsForAnimations(
|
| @@ -884,7 +884,7 @@ void CSSAnimations::calculateAnimationActiveInterpolations(
|
| newEffects.append(updatedAnimation.effect);
|
|
|
| ActiveInterpolationsMap activeInterpolationsForAnimations(
|
| - AnimationStack::activeInterpolations(
|
| + EffectStack::activeInterpolations(
|
| animationStack, &newEffects, &update.suppressedAnimations(),
|
| KeyframeEffectReadOnly::DefaultPriority, isStylePropertyHandle));
|
| update.adoptActiveInterpolationsForAnimations(
|
| @@ -896,13 +896,13 @@ void CSSAnimations::calculateTransitionActiveInterpolations(
|
| const Element* animatingElement) {
|
| ElementAnimations* elementAnimations =
|
| animatingElement ? animatingElement->elementAnimations() : nullptr;
|
| - AnimationStack* animationStack =
|
| + EffectStack* animationStack =
|
| elementAnimations ? &elementAnimations->animationStack() : nullptr;
|
|
|
| ActiveInterpolationsMap activeInterpolationsForTransitions;
|
| if (update.newTransitions().isEmpty() &&
|
| update.cancelledTransitions().isEmpty()) {
|
| - activeInterpolationsForTransitions = AnimationStack::activeInterpolations(
|
| + activeInterpolationsForTransitions = EffectStack::activeInterpolations(
|
| animationStack, nullptr, nullptr,
|
| KeyframeEffectReadOnly::TransitionPriority, isStylePropertyHandle);
|
| } else {
|
| @@ -921,7 +921,7 @@ void CSSAnimations::calculateTransitionActiveInterpolations(
|
| }
|
| }
|
|
|
| - activeInterpolationsForTransitions = AnimationStack::activeInterpolations(
|
| + activeInterpolationsForTransitions = EffectStack::activeInterpolations(
|
| animationStack, &newTransitions, &cancelledAnimations,
|
| KeyframeEffectReadOnly::TransitionPriority, isStylePropertyHandle);
|
| }
|
|
|