Web Animations API: Deferred computation of interpolated values

Source/core/animation/StringKeyframe.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef StringKeyframe_h
 #define StringKeyframe_h
 
+#include "core/animation/InterpolableValuePromise.h"
 #include "core/animation/Keyframe.h"
 #include "core/css/StylePropertySet.h"
 
 namespace WebCore {
 
 class StyleSheetContents;
 
 class StringKeyframe : public Keyframe {
 public:
     static PassRefPtrWillBeRawPtr<StringKeyframe> create()
@@ skipping 10 matching lines @@
     }
     virtual PropertySet properties() const OVERRIDE;
 
     virtual void trace(Visitor*) OVERRIDE;
 
     class PropertySpecificKeyframe : public Keyframe::PropertySpecificKeyframe {
     public:
         PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, CSSValue*, AnimationEffect::CompositeOperation);
 
         CSSValue* value() const { return m_value.get(); }
-        virtual const PassRefPtrWillBeRawPtr<AnimatableValue> getAnimatableValue() const OVERRIDE FINAL {
-            ASSERT(m_animatableValueCache);
-            return m_animatableValueCache.get();
-        }
+        virtual const PassRefPtrWillBeRawPtr<AnimatableValue> getAnimatableValue() const OVERRIDE FINAL;
 
         virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const OVERRIDE FINAL;
         virtual PassRefPtrWillBeRawPtr<Interpolation> createInterpolation(CSSPropertyID, WebCore::Keyframe::PropertySpecificKeyframe* end, Element*) const OVERRIDE FINAL;
 
         virtual void trace(Visitor*) OVERRIDE;
 
     private:
         PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, CSSValue*);
 
         virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> cloneWithOffset(double offset) const;
         virtual bool isStringPropertySpecificKeyframe() const OVERRIDE { return true; }
 
         RefPtrWillBeMember<CSSValue> m_value;
-        mutable RefPtrWillBeMember<AnimatableValue> m_animatableValueCache;
+        mutable RefPtrWillBeMember<InterpolableValuePromise> m_interpolableValuePromiseCache;
     };
 
 private:
     StringKeyframe()
         : m_propertySet(MutableStylePropertySet::create())
     { }
 
     StringKeyframe(const StringKeyframe& copyFrom);
 
     virtual PassRefPtrWillBeRawPtr<Keyframe> clone() const OVERRIDE;
     virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> createPropertySpecificKeyframe(CSSPropertyID) const OVERRIDE;
 
     virtual bool isStringKeyframe() const OVERRIDE { return true; }
 
     RefPtrWillBeMember<MutableStylePropertySet> m_propertySet;
 };
 
 typedef StringKeyframe::PropertySpecificKeyframe StringPropertySpecificKeyframe;
 
 DEFINE_TYPE_CASTS(StringKeyframe, Keyframe, value, value->isStringKeyframe(), value.isStringKeyframe());
 DEFINE_TYPE_CASTS(StringPropertySpecificKeyframe, Keyframe::PropertySpecificKeyframe, value, value->isStringPropertySpecificKeyframe(), value.isStringPropertySpecificKeyframe());
 
 }
 
 #endif