Include Web Animations when updating composited neutral keyframes

third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 215 matching lines @@
     if (!elementAnimations || elementAnimations->isAnimationStyleChange())
         return;
 
     if (!animatingElement->layoutObject() || !animatingElement->layoutObject()->style())
         return;
 
     const ComputedStyle& oldStyle = *animatingElement->layoutObject()->style();
     if (!oldStyle.shouldCompositeForCurrentAnimations())
         return;
 
-    CSSAnimations& cssAnimations = elementAnimations->cssAnimations();
-    for (auto& runningAnimation : cssAnimations.m_runningAnimations) {
-        Animation& animation = *runningAnimation->animation;
-        if (animation.effect() && animation.effect()->isKeyframeEffect()) {
-            EffectModel* model = toKeyframeEffect(animation.effect())->model();
-            if (model && model->isKeyframeEffectModel()) {
-                KeyframeEffectModelBase* keyframeEffect = toKeyframeEffectModelBase(model);
-                if (keyframeEffect->hasSyntheticKeyframes() && keyframeEffect->snapshotNeutralCompositorKeyframes(element, oldStyle, style))
-                    update.updateCompositorKeyframes(&animation);
-            }
+    bool transformZoomChanged = oldStyle.hasCurrentTransformAnimation() && oldStyle.effectiveZoom() != style.effectiveZoom();
+    for (auto& entry : elementAnimations->animations()) {
+        Animation& animation = *entry.key;
+        if (!animation.effect() || !animation.effect()->isKeyframeEffect())
+            continue;
+        EffectModel* model = toKeyframeEffect(animation.effect())->model();
+        if (!model || !model->isKeyframeEffectModel())
+            continue;
+        KeyframeEffectModelBase& keyframeEffect = toKeyframeEffectModelBase(*model);
+
+        bool updateCompositorKeyframes = false;
+        if (transformZoomChanged && keyframeEffect.affects(PropertyHandle(CSSPropertyTransform))
+            && keyframeEffect.snapshotAllCompositorKeyframes(element, &style)) {
+            updateCompositorKeyframes = true;
+        } else if (keyframeEffect.hasSyntheticKeyframes()
+            && keyframeEffect.snapshotNeutralCompositorKeyframes(element, oldStyle, style)) {
+            updateCompositorKeyframes = true;
         }
-    }
 
-    if (oldStyle.hasCurrentTransformAnimation() && oldStyle.effectiveZoom() != style.effectiveZoom()) {
-        for (auto& entry : elementAnimations->animations()) {
-            Animation& animation = *entry.key;
-            if (animation.effect() && animation.effect()->isKeyframeEffect()) {
-                EffectModel* model = toKeyframeEffect(animation.effect())->model();
-                if (model && model->isKeyframeEffectModel()) {
-                    KeyframeEffectModelBase* keyframeEffect = toKeyframeEffectModelBase(model);
-                    if (keyframeEffect->affects(PropertyHandle(CSSPropertyTransform)) && keyframeEffect->snapshotAllCompositorKeyframes(element, &style))
-                        update.updateCompositorKeyframes(&animation);
-                }
-            }
-        }
+        if (updateCompositorKeyframes)
+            update.updateCompositorKeyframes(&animation);
     }
 }
 
 void CSSAnimations::calculateAnimationUpdate(CSSAnimationUpdate& update, const Element* animatingElement, Element& element, const ComputedStyle& style, ComputedStyle* parentStyle, StyleResolver* resolver)
 {
     const ElementAnimations* elementAnimations = animatingElement ? animatingElement->elementAnimations() : nullptr;
 
     bool isAnimationStyleChange = elementAnimations && elementAnimations->isAnimationStyleChange();
 
 #if !ENABLE(ASSERT)
@@ skipping 597 matching lines @@
 }
 
 DEFINE_TRACE(CSSAnimations)
 {
     visitor->trace(m_transitions);
     visitor->trace(m_pendingUpdate);
     visitor->trace(m_runningAnimations);
 }
 
 } // namespace blink