Oilpan: Move AnimatableValue's hierarchy to oilpan's heap

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 55 matching lines @@
     AnimationEffect::CompositeOperation composite() const { return m_composite; }
     void setEasing(PassRefPtr<TimingFunction>);
     TimingFunction* easing() const { return m_easing.get(); }
     void setPropertyValue(CSSPropertyID, const AnimatableValue*);
     void clearPropertyValue(CSSPropertyID);
     const AnimatableValue* propertyValue(CSSPropertyID) const;
     PropertySet properties() const;
     PassRefPtrWillBeRawPtr<Keyframe> clone() const { return adoptRefWillBeNoop(new Keyframe(*this)); }
     PassRefPtrWillBeRawPtr<Keyframe> cloneWithOffset(double offset) const;
 
-    void trace(Visitor*) { }
+    void trace(Visitor*);
+
 private:
     Keyframe();
     Keyframe(const Keyframe&);
     double m_offset;
     AnimationEffect::CompositeOperation m_composite;
     RefPtr<TimingFunction> m_easing;
-    typedef HashMap<CSSPropertyID, RefPtr<AnimatableValue> > PropertyValueMap;
+    typedef WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<AnimatableValue> > PropertyValueMap;
     PropertyValueMap m_propertyValues;
 };
 
 class KeyframeEffectModel FINAL : public AnimationEffect {
 public:
     class PropertySpecificKeyframe;
     typedef WillBeHeapVector<RefPtrWillBeMember<Keyframe> > KeyframeVector;
     typedef Vector<OwnPtr<PropertySpecificKeyframe> > PropertySpecificKeyframeVector;

[Mads Ager (chromium), 2014/03/21 13:52:54]

In particular, this one does not trace the PropertySpecificKeyframes.

WillBeHeapVector<OwnPtrWillBeMember<PropertySpecificKeyframe> >

and move it to the heap?

     // FIXME: Implement accumulation.
     static PassRefPtrWillBeRawPtr<KeyframeEffectModel> create(const KeyframeVector& keyframes)
     {
         return adoptRefWillBeNoop(new KeyframeEffectModel(keyframes));
     }
 
     virtual bool affects(CSSPropertyID property) OVERRIDE
     {
         ensureKeyframeGroups();
         return m_keyframeGroups->contains(property);
@@ skipping 11 matching lines @@
 
     PropertySet properties() const;
 
     class PropertySpecificKeyframe {
     public:
         PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, const AnimatableValue*, CompositeOperation);
         double offset() const { return m_offset; }
         TimingFunction* easing() const { return m_easing.get(); }
         const AnimatableValue* value() const { return m_value.get(); }
         AnimationEffect::CompositeOperation composite() const { return m_composite; }
         PassOwnPtr<PropertySpecificKeyframe> cloneWithOffset(double offset) const;

[Mads Ager (chromium), 2014/03/21 13:49:30]

Where is this PassOwnPtr consumed? Are you tracing the resulting OwnPtr? If this
is allocated with new we should move it to the heap?

+
+        void trace(Visitor* visitor)
+        {
+            visitor->trace(m_value);
+        }
+
     private:
         // Used by cloneWithOffset().
-        PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, PassRefPtr<AnimatableValue>, CompositeOperation);
+        PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, PassRefPtrWillBeRawPtr<AnimatableValue>, CompositeOperation);
         double m_offset;
         RefPtr<TimingFunction> m_easing;
-        RefPtr<AnimatableValue> m_value;
+        RefPtrWillBeMember<AnimatableValue> m_value;
         AnimationEffect::CompositeOperation m_composite;
     };
 
     class PropertySpecificKeyframeGroup {
     public:
         void appendKeyframe(PassOwnPtr<PropertySpecificKeyframe>);
         const PropertySpecificKeyframeVector& keyframes() const { return m_keyframes; }
     private:
         PropertySpecificKeyframeVector m_keyframes;
         void removeRedundantKeyframes();
@@ skipping 29 matching lines @@
     mutable RefPtr<InterpolationEffect> m_interpolationEffect;
 
     friend class KeyframeEffectModelTest;
 };
 
 DEFINE_TYPE_CASTS(KeyframeEffectModel, AnimationEffect, value, value->isKeyframeEffectModel(), value.isKeyframeEffectModel());
 
 } // namespace WebCore
 
 #endif // KeyframeEffectModel_h