Defer compositor keyframe snapshots until the next style resolve

third_party/WebKit/Source/core/animation/KeyframeEffectModel.h

 /*
  * 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 87 matching lines @@
 
     virtual bool isAnimatableValueKeyframeEffectModel() const { return false; }
     virtual bool isStringKeyframeEffectModel() const { return false; }
 
     bool hasSyntheticKeyframes() const
     {
         ensureKeyframeGroups();
         return m_hasSyntheticKeyframes;
     }
 
-    // FIXME: This is a hack used to resolve CSSValues to AnimatableValues while we have a valid handle on an element.
-    // This should be removed once AnimatableValues are obsolete.
-    void forceConversionsToAnimatableValues(Element&, const ComputedStyle* baseStyle);
-    bool snapshotNeutralCompositorKeyframes(Element&, const ComputedStyle& oldStyle, const ComputedStyle& newStyle);
-    bool snapshotAllCompositorKeyframes(Element&, const ComputedStyle* baseStyle);
+    bool needsCompositorKeyframesSnapshot() const { return m_needsCompositorKeyframesSnapshot; }
+    bool snapshotNeutralCompositorKeyframes(Element&, const ComputedStyle& oldStyle, const ComputedStyle& newStyle, const ComputedStyle* parentStyle) const;
+    bool snapshotAllCompositorKeyframes(Element&, const ComputedStyle& baseStyle, const ComputedStyle* parentStyle) const;
 
     static KeyframeVector normalizedKeyframesForInspector(const KeyframeVector& keyframes) { return normalizedKeyframes(keyframes); }
 
     bool affects(PropertyHandle property) const override
     {
         ensureKeyframeGroups();
         return m_keyframeGroups->contains(property);
     }
 
     bool isTransformRelatedEffect() const override;
 
 protected:
     KeyframeEffectModelBase(PassRefPtr<TimingFunction> defaultKeyframeEasing)
         : m_lastIteration(0)
         , m_lastFraction(std::numeric_limits<double>::quiet_NaN())
         , m_lastIterationDuration(0)
         , m_defaultKeyframeEasing(defaultKeyframeEasing)
         , m_hasSyntheticKeyframes(false)
+        , m_needsCompositorKeyframesSnapshot(true)
     {
     }
 
     static KeyframeVector normalizedKeyframes(const KeyframeVector& keyframes);
 
     // Lazily computes the groups of property-specific keyframes.
     void ensureKeyframeGroups() const;
     void ensureInterpolationEffectPopulated() const;
 
     KeyframeVector m_keyframes;
     // The spec describes filtering the normalized keyframes at sampling time
     // to get the 'property-specific keyframes'. For efficiency, we cache the
     // property-specific lists.
     mutable std::unique_ptr<KeyframeGroupMap> m_keyframeGroups;
     mutable InterpolationEffect m_interpolationEffect;
     mutable int m_lastIteration;
     mutable double m_lastFraction;
     mutable double m_lastIterationDuration;
     RefPtr<TimingFunction> m_defaultKeyframeEasing;
 
     mutable bool m_hasSyntheticKeyframes;
+    mutable bool m_needsCompositorKeyframesSnapshot;
 
     friend class KeyframeEffectModelTest;
 };
 
 // Time independent representation of an Animation's keyframes.
 template <class Keyframe>
 class KeyframeEffectModel final : public KeyframeEffectModelBase {
 public:
     using KeyframeVector = Vector<RefPtr<Keyframe>>;
     static KeyframeEffectModel<Keyframe>* create(const KeyframeVector& keyframes, PassRefPtr<TimingFunction> defaultKeyframeEasing = nullptr)
@@ skipping 49 matching lines @@
 
 template <>
 inline bool KeyframeEffectModel<AnimatableValueKeyframe>::isAnimatableValueKeyframeEffectModel() const { return true; }
 
 template <>
 inline bool KeyframeEffectModel<StringKeyframe>::isStringKeyframeEffectModel() const { return true; }
 
 } // namespace blink
 
 #endif // KeyframeEffectModel_h