Modify AnimationEffect::sample() to return a CompositableValue

Source/core/animation/Animation.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 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef Animation_h
 #define Animation_h
 
 #include "core/animation/AnimationEffect.h"
 #include "core/animation/TimedItem.h"
-#include "core/css/StylePropertySet.h"
 #include "wtf/RefPtr.h"
 
 namespace WebCore {
 
 class Element;
 
 class Animation FINAL : public TimedItem {
 
 public:
     static PassRefPtr<Animation> create(PassRefPtr<Element> target, PassRefPtr<AnimationEffect>, Timing&);
     virtual ~Animation();
 
-    StylePropertySet* cachedStyle()
+    const AnimationEffect::CompositableValueMap* compositableValues() const
     {
-        ASSERT(m_cachedStyle.get());
-        return m_cachedStyle.get();
+        ASSERT(m_compositableValues);
+        return m_compositableValues.get();
     }
 
 protected:
     virtual void applyEffects(bool previouslyActiveOrInEffect);
     virtual void clearEffects();
     virtual void updateChildrenAndEffects(bool) const OVERRIDE FINAL;
 
 private:
     Animation(PassRefPtr<Element>, PassRefPtr<AnimationEffect>, Timing&);
 
     RefPtr<Element> m_target;
     RefPtr<AnimationEffect> m_effect;
     bool m_isInTargetActiveAnimationsList;
-    RefPtr<StylePropertySet> m_cachedStyle;
+    OwnPtr<AnimationEffect::CompositableValueMap> m_compositableValues;
 };
 
 } // namespace
 
 #endif