Make Keyframe::PropertySpecificKeyframes RefCounted

third_party/WebKit/Source/core/animation/StringKeyframe.cpp

 // 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.
 
 #include "core/animation/StringKeyframe.h"
 
 #include "core/StylePropertyShorthand.h"
 #include "core/animation/ConstantStyleInterpolation.h"
 #include "core/animation/DeferredLegacyStyleInterpolation.h"
 #include "core/animation/DoubleStyleInterpolation.h"
@@ skipping 69 matching lines @@
         properties.add(PropertyHandle(*key));
 
     return properties;
 }
 
 PassRefPtr<Keyframe> StringKeyframe::clone() const
 {
     return adoptRef(new StringKeyframe(*this));
 }
 
-PassOwnPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::createPropertySpecificKeyframe(PropertyHandle property) const
+PassRefPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::createPropertySpecificKeyframe(PropertyHandle property) const
 {
     if (property.isCSSProperty())
-        return adoptPtr(new CSSPropertySpecificKeyframe(offset(), &easing(), cssPropertyValue(property.cssProperty()), composite()));
+        return CSSPropertySpecificKeyframe::create(offset(), &easing(), cssPropertyValue(property.cssProperty()), composite());
 
     if (property.isPresentationAttribute())
-        return adoptPtr(new CSSPropertySpecificKeyframe(offset(), &easing(), presentationAttributeValue(property.presentationAttribute()), composite()));
+        return CSSPropertySpecificKeyframe::create(offset(), &easing(), presentationAttributeValue(property.presentationAttribute()), composite());
 
     ASSERT(property.isSVGAttribute());
-    return adoptPtr(new SVGPropertySpecificKeyframe(offset(), &easing(), svgPropertyValue(property.svgAttribute()), composite()));
-}
-
-StringKeyframe::CSSPropertySpecificKeyframe::CSSPropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, CSSValue* value, EffectModel::CompositeOperation op)
-    : Keyframe::PropertySpecificKeyframe(offset, easing, op)
-    , m_value(value)
-{ }
-
-StringKeyframe::CSSPropertySpecificKeyframe::CSSPropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, CSSValue* value)
-    : Keyframe::PropertySpecificKeyframe(offset, easing, EffectModel::CompositeReplace)
-    , m_value(value)
-{
-    ASSERT(!isNull(m_offset));
+    return SVGPropertySpecificKeyframe::create(offset(), &easing(), svgPropertyValue(property.svgAttribute()), composite());
 }
 
 bool StringKeyframe::CSSPropertySpecificKeyframe::populateAnimatableValue(CSSPropertyID property, Element& element, const ComputedStyle* baseStyle, bool force) const
 {
     if (m_animatableValueCache && !force)
         return false;
     if (!baseStyle && (!m_value || DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(*m_value)))
         return false;
     if (!element.document().frame())
         return false;
@@ skipping 14 matching lines @@
     ASSERT(element);
     populateAnimatableValue(property, *element, baseStyle, false);
     end.populateAnimatableValue(property, *element, baseStyle, false);
     return LegacyStyleInterpolation::create(getAnimatableValue(), end.getAnimatableValue(), property);
 }
 
 PassRefPtr<Interpolation> StringKeyframe::CSSPropertySpecificKeyframe::maybeCreateInterpolation(PropertyHandle propertyHandle, Keyframe::PropertySpecificKeyframe& end, Element* element, const ComputedStyle* baseStyle) const
 {
     const InterpolationTypes* applicableTypes = PropertyInterpolationTypesMapping::get(propertyHandle);
     if (applicableTypes)
-        return InvalidatableInterpolation::create(propertyHandle, *applicableTypes, *this, end);
+        return InvalidatableInterpolation::create(propertyHandle, *applicableTypes, const_cast<CSSPropertySpecificKeyframe*>(this), &end);
 
     // TODO(alancutter): Remove the remainder of this function.
 
     // FIXME: Refactor this into a generic piece that lives in InterpolationEffect, and a template parameter specific converter.
     CSSPropertyID property = propertyHandle.isCSSProperty() ? propertyHandle.cssProperty() : propertyHandle.presentationAttribute();
     CSSValue* fromCSSValue = m_value.get();
     CSSValue* toCSSValue = toCSSPropertySpecificKeyframe(end).value();
     InterpolationRange range = RangeAll;
 
     // FIXME: Remove this flag once we can rely on legacy's behaviour being correct.
@@ skipping 120 matching lines @@
     if (!forceDefaultInterpolation) {
         ASSERT(AnimatableValue::usesDefaultInterpolation(
             StyleResolver::createAnimatableValueSnapshot(*element, baseStyle, property, fromCSSValue).get(),
             StyleResolver::createAnimatableValueSnapshot(*element, baseStyle, property, toCSSValue).get()));
     }
 
     return nullptr;
 
 }
 
-PassOwnPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::CSSPropertySpecificKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const
+PassRefPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::CSSPropertySpecificKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const
 {
-    return adoptPtr(new CSSPropertySpecificKeyframe(offset, easing, static_cast<CSSValue*>(0), EffectModel::CompositeAdd));
+    return create(offset, easing, nullptr, EffectModel::CompositeAdd);
 }
 
-PassOwnPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::CSSPropertySpecificKeyframe::cloneWithOffset(double offset) const
+PassRefPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::CSSPropertySpecificKeyframe::cloneWithOffset(double offset) const
 {
-    Keyframe::PropertySpecificKeyframe* theClone = new CSSPropertySpecificKeyframe(offset, m_easing, m_value.get());
-    toCSSPropertySpecificKeyframe(theClone)->m_animatableValueCache = m_animatableValueCache;
-    return adoptPtr(theClone);
+    RefPtr<CSSPropertySpecificKeyframe> clone = create(offset, m_easing, m_value.get(), m_composite);
+    clone->m_animatableValueCache = m_animatableValueCache;
+    return clone.release();
 }
 
-SVGPropertySpecificKeyframe::SVGPropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, const String& value, EffectModel::CompositeOperation op)
-    : Keyframe::PropertySpecificKeyframe(offset, easing, op)
-    , m_value(value)
+PassRefPtr<Keyframe::PropertySpecificKeyframe> SVGPropertySpecificKeyframe::cloneWithOffset(double offset) const
 {
+    return create(offset, m_easing, m_value, m_composite);
 }
 
-SVGPropertySpecificKeyframe::SVGPropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, const String& value)
-    : Keyframe::PropertySpecificKeyframe(offset, easing, EffectModel::CompositeReplace)
-    , m_value(value)
+PassRefPtr<Keyframe::PropertySpecificKeyframe> SVGPropertySpecificKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const
 {
-    ASSERT(!isNull(m_offset));
-}
-
-PassOwnPtr<Keyframe::PropertySpecificKeyframe> SVGPropertySpecificKeyframe::cloneWithOffset(double offset) const
-{
-    return adoptPtr(new SVGPropertySpecificKeyframe(offset, m_easing, m_value));
-}
-
-PassOwnPtr<Keyframe::PropertySpecificKeyframe> SVGPropertySpecificKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const
-{
-    return adoptPtr(new SVGPropertySpecificKeyframe(offset, easing, String(), EffectModel::CompositeAdd));
+    return create(offset, easing, String(), EffectModel::CompositeAdd);
 }
 
 PassRefPtr<Interpolation> SVGPropertySpecificKeyframe::maybeCreateInterpolation(PropertyHandle propertyHandle, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle*) const
 {
     const InterpolationTypes* applicableTypes = PropertyInterpolationTypesMapping::get(propertyHandle);
     ASSERT(applicableTypes);
-    return InvalidatableInterpolation::create(propertyHandle, *applicableTypes, *this, end);
+    return InvalidatableInterpolation::create(propertyHandle, *applicableTypes, const_cast<SVGPropertySpecificKeyframe*>(this), &end);
 }
 
 } // namespace blink