Defer compositor keyframe snapshots until the next style resolve

third_party/WebKit/Source/core/animation/KeyframeEffectModel.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 60 matching lines @@
     ensureInterpolationEffectPopulated();
 
     bool changed = iteration != m_lastIteration || fraction != m_lastFraction || iterationDuration != m_lastIterationDuration;
     m_lastIteration = iteration;
     m_lastFraction = fraction;
     m_lastIterationDuration = iterationDuration;
     m_interpolationEffect.getActiveInterpolations(fraction, iterationDuration, result);
     return changed;
 }
 
-void KeyframeEffectModelBase::forceConversionsToAnimatableValues(Element& element, const ComputedStyle* baseStyle)
-{
-    ensureKeyframeGroups();
-    // TODO(alancutter): Defer compositor keyframe snapshotting to style resolve to remove the Element and ComputedStyle dependency here.
-    snapshotAllCompositorKeyframes(element, baseStyle);
-    ensureInterpolationEffectPopulated();
-}
-
-bool KeyframeEffectModelBase::snapshotNeutralCompositorKeyframes(Element& element, const ComputedStyle& oldStyle, const ComputedStyle& newStyle)
+bool KeyframeEffectModelBase::snapshotNeutralCompositorKeyframes(Element& element, const ComputedStyle& oldStyle, const ComputedStyle& newStyle, const ComputedStyle* parentStyle) const
 {
     bool updated = false;
     ensureKeyframeGroups();
     for (CSSPropertyID property : CompositorAnimations::compositableProperties) {
         if (CSSPropertyEquality::propertiesEqual(property, oldStyle, newStyle))
             continue;
         PropertySpecificKeyframeGroup* keyframeGroup = m_keyframeGroups->get(PropertyHandle(property));
         if (!keyframeGroup)
             continue;
         for (auto& keyframe : keyframeGroup->m_keyframes) {
             if (keyframe->isNeutral())
-                updated |= keyframe->populateAnimatableValue(property, element, &newStyle, true);
+                updated |= keyframe->populateAnimatableValue(property, element, newStyle, parentStyle);
         }
     }
     return updated;
 }
 
-bool KeyframeEffectModelBase::snapshotAllCompositorKeyframes(Element& element, const ComputedStyle* baseStyle)
+bool KeyframeEffectModelBase::snapshotAllCompositorKeyframes(Element& element, const ComputedStyle& baseStyle, const ComputedStyle* parentStyle) const
 {
+    m_needsCompositorKeyframesSnapshot = false;
     bool updated = false;
     ensureKeyframeGroups();
     for (CSSPropertyID property : CompositorAnimations::compositableProperties) {
         PropertySpecificKeyframeGroup* keyframeGroup = m_keyframeGroups->get(PropertyHandle(property));
         if (!keyframeGroup)
             continue;
         for (auto& keyframe : keyframeGroup->m_keyframes)
-            updated |= keyframe->populateAnimatableValue(property, element, baseStyle, true);
+            updated |= keyframe->populateAnimatableValue(property, element, baseStyle, parentStyle);
     }
     return updated;
 }
 
 KeyframeEffectModelBase::KeyframeVector KeyframeEffectModelBase::normalizedKeyframes(const KeyframeVector& keyframes)
 {
     double lastOffset = 0;
     KeyframeVector result;
     result.reserveCapacity(keyframes.size());
 
@@ skipping 171 matching lines @@
     }
     if (m_keyframes.last()->offset() != 1.0) {
         appendKeyframe(m_keyframes.last()->neutralKeyframe(1, nullptr));
         addedSyntheticKeyframe = true;
     }
 
     return addedSyntheticKeyframe;
 }
 
 } // namespace blink