Make Keyframe::PropertySpecificKeyframes RefCounted

third_party/WebKit/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/Keyframe.h"
 #include "core/css/StylePropertySet.h"
 
@@ skipping 32 matching lines @@
 
     String svgPropertyValue(const QualifiedName& attributeName) const
     {
         return m_svgAttributeMap.get(&attributeName);
     }
 
     PropertyHandleSet properties() const override;
 
     class CSSPropertySpecificKeyframe : public Keyframe::PropertySpecificKeyframe {
     public:
-        CSSPropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, CSSValue*, EffectModel::CompositeOperation);
+        static PassRefPtr<CSSPropertySpecificKeyframe> create(double offset, PassRefPtr<TimingFunction> easing, CSSValue* value, EffectModel::CompositeOperation composite)
+        {
+            return adoptRef(new CSSPropertySpecificKeyframe(offset, easing, value, composite));
+        }
 
         CSSValue* value() const { return m_value.get(); }
 
         virtual bool populateAnimatableValue(CSSPropertyID, Element&, const ComputedStyle* baseStyle, bool force) const;
         const PassRefPtr<AnimatableValue> getAnimatableValue() const final { return m_animatableValueCache.get(); }
         void setAnimatableValue(PassRefPtr<AnimatableValue> value) { m_animatableValueCache = value; }
 
         bool isNeutral() const final { return !m_value; }
-        PassOwnPtr<Keyframe::PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const final;
+        PassRefPtr<Keyframe::PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const final;
         PassRefPtr<Interpolation> maybeCreateInterpolation(PropertyHandle, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle* baseStyle) const final;
 
     private:
-        CSSPropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, CSSValue*);
+        CSSPropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, CSSValue* value, EffectModel::CompositeOperation composite)
+            : Keyframe::PropertySpecificKeyframe(offset, easing, composite)
+            , m_value(value)
+        { }
 
-        virtual PassOwnPtr<Keyframe::PropertySpecificKeyframe> cloneWithOffset(double offset) const;
+        virtual PassRefPtr<Keyframe::PropertySpecificKeyframe> cloneWithOffset(double offset) const;
         bool isCSSPropertySpecificKeyframe() const override { return true; }
 
         PassRefPtr<Interpolation> createLegacyStyleInterpolation(CSSPropertyID, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle* baseStyle) const;
         static bool createInterpolationsFromCSSValues(CSSPropertyID, CSSValue* fromCSSValue, CSSValue* toCSSValue, Element*, OwnPtr<Vector<RefPtr<Interpolation>>>& interpolations);
 
         void populateAnimatableValueCaches(CSSPropertyID, Keyframe::PropertySpecificKeyframe&, Element*, CSSValue& fromCSSValue, CSSValue& toCSSValue) const;
 
         RefPtrWillBePersistent<CSSValue> m_value;
         mutable RefPtr<AnimatableValue> m_animatableValueCache;
     };
 
     class SVGPropertySpecificKeyframe : public Keyframe::PropertySpecificKeyframe {
     public:
-        SVGPropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, const String&, EffectModel::CompositeOperation);
+        static PassRefPtr<SVGPropertySpecificKeyframe> create(double offset, PassRefPtr<TimingFunction> easing, const String& value, EffectModel::CompositeOperation composite)
+        {
+            return adoptRef(new SVGPropertySpecificKeyframe(offset, easing, value, composite));
+        }
 
         const String& value() const { return m_value; }
 
-        PassOwnPtr<PropertySpecificKeyframe> cloneWithOffset(double offset) const final;
+        PassRefPtr<PropertySpecificKeyframe> cloneWithOffset(double offset) const final;
 
         const PassRefPtr<AnimatableValue> getAnimatableValue() const final { return nullptr; }
 
         bool isNeutral() const final { return m_value.isNull(); }
-        PassOwnPtr<PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const final;
+        PassRefPtr<PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const final;
         PassRefPtr<Interpolation> maybeCreateInterpolation(PropertyHandle, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle* baseStyle) const final;
 
     private:
-        SVGPropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, const String&);
+        SVGPropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, const String& value, EffectModel::CompositeOperation composite)
+            : Keyframe::PropertySpecificKeyframe(offset, easing, composite)
+            , m_value(value)
+        { }
 
         bool isSVGPropertySpecificKeyframe() const override { return true; }
 
         String m_value;
     };
 
 private:
     StringKeyframe()
         : m_cssPropertyMap(MutableStylePropertySet::create(HTMLStandardMode))
         , m_presentationAttributeMap(MutableStylePropertySet::create(HTMLStandardMode))
     { }
 
     StringKeyframe(const StringKeyframe& copyFrom);
 
     PassRefPtr<Keyframe> clone() const override;
-    PassOwnPtr<Keyframe::PropertySpecificKeyframe> createPropertySpecificKeyframe(PropertyHandle) const override;
+    PassRefPtr<Keyframe::PropertySpecificKeyframe> createPropertySpecificKeyframe(PropertyHandle) const override;
 
     bool isStringKeyframe() const override { return true; }
 
     RefPtrWillBePersistent<MutableStylePropertySet> m_cssPropertyMap;
     RefPtrWillBePersistent<MutableStylePropertySet> m_presentationAttributeMap;
     HashMap<const QualifiedName*, String> m_svgAttributeMap;
 };
 
 using CSSPropertySpecificKeyframe = StringKeyframe::CSSPropertySpecificKeyframe;
 using SVGPropertySpecificKeyframe = StringKeyframe::SVGPropertySpecificKeyframe;
 
 DEFINE_TYPE_CASTS(StringKeyframe, Keyframe, value, value->isStringKeyframe(), value.isStringKeyframe());
 DEFINE_TYPE_CASTS(CSSPropertySpecificKeyframe, Keyframe::PropertySpecificKeyframe, value, value->isCSSPropertySpecificKeyframe(), value.isCSSPropertySpecificKeyframe());
 DEFINE_TYPE_CASTS(SVGPropertySpecificKeyframe, Keyframe::PropertySpecificKeyframe, value, value->isSVGPropertySpecificKeyframe(), value.isSVGPropertySpecificKeyframe());
 
 } // namespace blink
 
 #endif