Oilpan: Unship CSSValues and AnimatableValues

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 38 matching lines @@
 
 namespace blink {
 
 class Element;
 class KeyframeEffectModelTest;
 
 class CORE_EXPORT KeyframeEffectModelBase : public EffectModel {
 public:
     // FIXME: Implement accumulation.
 
-    using PropertySpecificKeyframeVector = WillBeHeapVector<OwnPtrWillBeMember<Keyframe::PropertySpecificKeyframe>>;
-    class PropertySpecificKeyframeGroup : public NoBaseWillBeGarbageCollected<PropertySpecificKeyframeGroup> {
+    using PropertySpecificKeyframeVector = Vector<OwnPtr<Keyframe::PropertySpecificKeyframe>>;
+    class PropertySpecificKeyframeGroup {
     public:
-        void appendKeyframe(PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe>);
+        void appendKeyframe(PassOwnPtr<Keyframe::PropertySpecificKeyframe>);
         const PropertySpecificKeyframeVector& keyframes() const { return m_keyframes; }
 
-        DECLARE_TRACE();
-
     private:
         void removeRedundantKeyframes();
         bool addSyntheticKeyframeIfRequired(PassRefPtr<TimingFunction> neutralKeyframeEasing);
 
         PropertySpecificKeyframeVector m_keyframes;
 
         friend class KeyframeEffectModelBase;
     };
 
     bool isReplaceOnly();
 
     PropertyHandleSet properties() const;
 
-    using KeyframeVector = WillBeHeapVector<RefPtrWillBeMember<Keyframe>>;
+    using KeyframeVector = Vector<RefPtr<Keyframe>>;
     const KeyframeVector& getFrames() const { return m_keyframes; }
     void setFrames(KeyframeVector& keyframes);
 
     const PropertySpecificKeyframeVector& getPropertySpecificKeyframes(PropertyHandle property) const
     {
         ensureKeyframeGroups();
         return m_keyframeGroups->get(property)->keyframes();
     }
 
     // EffectModel implementation.
     void sample(int iteration, double fraction, double iterationDuration, OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>>&) const override;
 
     bool isKeyframeEffectModel() const override { return true; }
 
     virtual bool isAnimatableValueKeyframeEffectModel() const { return false; }
     virtual bool isStringKeyframeEffectModel() const { return false; }
 
     bool hasSyntheticKeyframes() const
     {
         ensureKeyframeGroups();
         return m_hasSyntheticKeyframes;
     }
 
     DECLARE_VIRTUAL_TRACE();
 
     // 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 updateNeutralKeyframeAnimatableValues(CSSPropertyID, PassRefPtrWillBeRawPtr<AnimatableValue>);
+    bool updateNeutralKeyframeAnimatableValues(CSSPropertyID, PassRefPtr<AnimatableValue>);
 
     template<typename T>
     inline void forEachInterpolation(const T& callback) { m_interpolationEffect->forEachInterpolation(callback); }
 
     static KeyframeVector normalizedKeyframesForInspector(const KeyframeVector& keyframes) { return normalizedKeyframes(keyframes); }
 
     bool affects(PropertyHandle property) const override
     {
         ensureKeyframeGroups();
         return m_keyframeGroups->contains(property);
@@ skipping 11 matching lines @@
 
     // Lazily computes the groups of property-specific keyframes.
     void ensureKeyframeGroups() const;
     void ensureInterpolationEffect(Element* = nullptr, const ComputedStyle* baseStyle = nullptr) const;
     void snapshotCompositableProperties(Element&, const ComputedStyle* baseStyle);
 
     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.
-    using KeyframeGroupMap = WillBeHeapHashMap<PropertyHandle, OwnPtrWillBeMember<PropertySpecificKeyframeGroup>>;
-    mutable OwnPtrWillBeMember<KeyframeGroupMap> m_keyframeGroups;
+    using KeyframeGroupMap = HashMap<PropertyHandle, OwnPtr<PropertySpecificKeyframeGroup>>;
+    mutable OwnPtr<KeyframeGroupMap> m_keyframeGroups;
     mutable RefPtrWillBeMember<InterpolationEffect> m_interpolationEffect;
     RefPtr<TimingFunction> m_neutralKeyframeEasing;
 
     mutable bool m_hasSyntheticKeyframes;
 
     friend class KeyframeEffectModelTest;
 };
 
 template <class Keyframe>
 class KeyframeEffectModel final : public KeyframeEffectModelBase {
 public:
-    using KeyframeVector = WillBeHeapVector<RefPtrWillBeMember<Keyframe>>;
+    using KeyframeVector = Vector<RefPtr<Keyframe>>;
     static PassRefPtrWillBeRawPtr<KeyframeEffectModel<Keyframe>> create(const KeyframeVector& keyframes, PassRefPtrWillBeRawPtr<TimingFunction> neutralKeyframeEasing = nullptr)
     {
         return adoptRefWillBeNoop(new KeyframeEffectModel(keyframes, neutralKeyframeEasing));
     }
 
 private:
     KeyframeEffectModel(const KeyframeVector& keyframes, PassRefPtrWillBeRawPtr<TimingFunction> neutralKeyframeEasing)
         : KeyframeEffectModelBase(neutralKeyframeEasing)
     {
         m_keyframes.appendVector(keyframes);
@@ skipping 40 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