Web Animations: Introduce String based KeyframeEffectModel

Source/core/animation/AnimatableValueKeyframe.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 AnimatableValueKeyframe_h
+#define AnimatableValueKeyframe_h
+
+#include "core/animation/AnimatableValue.h"
+#include "core/animation/Keyframe.h"
+
+namespace WebCore {
+
+class AnimatableValueKeyframe : public Keyframe {
+public:
+    static PassRefPtr<AnimatableValueKeyframe> create() { return adoptRef(new AnimatableValueKeyframe); }
+    void setPropertyValue(CSSPropertyID property, PassRefPtr<AnimatableValue> value)
+    {
+        m_propertyValues.add(property, value);
+    }
+    void clearPropertyValue(CSSPropertyID property) { m_propertyValues.remove(property); }
+    AnimatableValue* propertyValue(CSSPropertyID property) const
+    {
+        ASSERT(m_propertyValues.contains(property));
+        return m_propertyValues.get(property);
+    }
+    virtual PropertySet properties() const OVERRIDE;
+
+    class PropertySpecificKeyframe : public Keyframe::PropertySpecificKeyframe {
+    public:
+        PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, const AnimatableValue* value, AnimationEffect::CompositeOperation op)
+            : Keyframe::PropertySpecificKeyframe(offset, easing, op)
+            , m_value(PassRefPtr<AnimatableValue>(const_cast<AnimatableValue*>(value)))
+        {
+        }
+
+        AnimatableValue* value() const { return m_value.get(); }
+
+        virtual PassOwnPtr<Keyframe::PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const OVERRIDE FINAL;
+        virtual PassRefPtr<Interpolation> createInterpolation(CSSPropertyID, WebCore::Keyframe::PropertySpecificKeyframe* end) const OVERRIDE FINAL;
+
+    private:
+        PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, PassRefPtr<AnimatableValue> value)
+            : Keyframe::PropertySpecificKeyframe(offset, easing, AnimationEffect::CompositeReplace)
+            , m_value(value)
+        {
+            ASSERT(!isNull(m_offset));
+        }
+
+        virtual PassOwnPtr<Keyframe::PropertySpecificKeyframe> cloneWithOffset(double offset) const OVERRIDE;
+        virtual bool isAnimatableValuePropertySpecificKeyframe() const OVERRIDE { return true; }
+
+        RefPtr<AnimatableValue> m_value;
+    };
+
+private:
+    AnimatableValueKeyframe()

[esprehn, 2014/04/01 22:53:33]

Why not use the default generated constructor?

[shans, 2014/04/02 11:54:45]

Done.

+        : Keyframe()
+    {
+    }
+    AnimatableValueKeyframe(const AnimatableValueKeyframe& copyFrom);
+
+    virtual PassRefPtrWillBeRawPtr<Keyframe> clone() const OVERRIDE
+    {
+        return adoptRefWillBeNoop(new AnimatableValueKeyframe(*this));
+    }
+    virtual PassOwnPtr<Keyframe::PropertySpecificKeyframe> createPropertySpecificKeyframe(CSSPropertyID property) const OVERRIDE
+    {
+        return adoptPtr(new PropertySpecificKeyframe(offset(), easing(), propertyValue(property), composite()));

[esprehn, 2014/04/01 22:53:33]

This is so much inline, does it all really need to be?

[shans, 2014/04/02 11:54:45]

Moved these and PropertySpecificKeyframe constructors above into .cpp file. Did
the same for StringKeyframe.

+    }
+    virtual bool isAnimatableValueKeyframe() const OVERRIDE { return true; }
+
+    typedef HashMap<CSSPropertyID, RefPtr<AnimatableValue> > PropertyValueMap;
+    PropertyValueMap m_propertyValues;
+};
+
+typedef AnimatableValueKeyframe::PropertySpecificKeyframe AnimatableValuePropertySpecificKeyframe;
+
+DEFINE_TYPE_CASTS(AnimatableValueKeyframe, Keyframe, value, value->isAnimatableValueKeyframe(), value.isAnimatableValueKeyframe());
+DEFINE_TYPE_CASTS(AnimatableValuePropertySpecificKeyframe, PropertySpecificKeyframe, value, value->isAnimatableValuePropertySpecificKeyframe(), value.isAnimatableValuePropertySpecificKeyframe());
+
+}
+
+#endif