| Index: Source/core/animation/Keyframe.h
|
| diff --git a/Source/core/animation/Keyframe.h b/Source/core/animation/Keyframe.h
|
| index 527fb9a204ae1344b99b03aef190b4922a5f283f..317e962aa4052e57c039b8b1706596119ae1e384 100644
|
| --- a/Source/core/animation/Keyframe.h
|
| +++ b/Source/core/animation/Keyframe.h
|
| @@ -20,8 +20,7 @@ class Element;
|
| class ComputedStyle;
|
|
|
| // FIXME: Make Keyframe immutable
|
| -class CORE_EXPORT Keyframe : public RefCountedWillBeGarbageCollectedFinalized<Keyframe> {
|
| - WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(Keyframe);
|
| +class CORE_EXPORT Keyframe : public GarbageCollectedFinalized<Keyframe> {
|
| WTF_MAKE_NONCOPYABLE(Keyframe);
|
| public:
|
| virtual ~Keyframe() { }
|
| @@ -35,19 +34,19 @@ public:
|
| void setEasing(PassRefPtr<TimingFunction> easing) { m_easing = easing; }
|
| TimingFunction& easing() const { return *m_easing; }
|
|
|
| - static bool compareOffsets(const RefPtrWillBeMember<Keyframe>& a, const RefPtrWillBeMember<Keyframe>& b)
|
| + static bool compareOffsets(const Member<Keyframe>& a, const Member<Keyframe>& b)
|
| {
|
| return a->offset() < b->offset();
|
| }
|
|
|
| virtual PropertyHandleSet properties() const = 0;
|
|
|
| - virtual PassRefPtrWillBeRawPtr<Keyframe> clone() const = 0;
|
| - PassRefPtrWillBeRawPtr<Keyframe> cloneWithOffset(double offset) const
|
| + virtual Keyframe* clone() const = 0;
|
| + Keyframe* cloneWithOffset(double offset) const
|
| {
|
| - RefPtrWillBeRawPtr<Keyframe> theClone = clone();
|
| + Keyframe* theClone = clone();
|
| theClone->setOffset(offset);
|
| - return theClone.release();
|
| + return theClone;
|
| }
|
|
|
| virtual bool isAnimatableValueKeyframe() const { return false; }
|
| @@ -55,8 +54,7 @@ public:
|
|
|
| DEFINE_INLINE_VIRTUAL_TRACE() { }
|
|
|
| - class PropertySpecificKeyframe : public NoBaseWillBeGarbageCollectedFinalized<PropertySpecificKeyframe> {
|
| - WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(PropertySpecificKeyframe);
|
| + class PropertySpecificKeyframe : public GarbageCollectedFinalized<PropertySpecificKeyframe> {
|
| WTF_MAKE_NONCOPYABLE(PropertySpecificKeyframe);
|
| public:
|
| virtual ~PropertySpecificKeyframe() { }
|
| @@ -65,18 +63,18 @@ public:
|
| EffectModel::CompositeOperation composite() const { return m_composite; }
|
| double underlyingFraction() const { return m_composite == EffectModel::CompositeReplace ? 0 : 1; }
|
| virtual bool isNeutral() const { ASSERT_NOT_REACHED(); return false; }
|
| - virtual PassOwnPtrWillBeRawPtr<PropertySpecificKeyframe> cloneWithOffset(double offset) const = 0;
|
| + virtual PropertySpecificKeyframe* cloneWithOffset(double offset) const = 0;
|
|
|
| // FIXME: Remove this once CompositorAnimations no longer depends on AnimatableValues
|
| virtual void populateAnimatableValue(CSSPropertyID, Element&, const ComputedStyle* baseStyle) const { }
|
| - virtual const PassRefPtrWillBeRawPtr<AnimatableValue> getAnimatableValue() const = 0;
|
| + virtual AnimatableValue* getAnimatableValue() const = 0;
|
|
|
| virtual bool isAnimatableValuePropertySpecificKeyframe() const { return false; }
|
| virtual bool isCSSPropertySpecificKeyframe() const { return false; }
|
| virtual bool isSVGPropertySpecificKeyframe() const { return false; }
|
|
|
| - virtual PassOwnPtrWillBeRawPtr<PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const = 0;
|
| - virtual PassRefPtrWillBeRawPtr<Interpolation> maybeCreateInterpolation(PropertyHandle, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle* baseStyle) const = 0;
|
| + virtual PropertySpecificKeyframe* neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const = 0;
|
| + virtual Interpolation* maybeCreateInterpolation(PropertyHandle, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle* baseStyle) const = 0;
|
|
|
| DEFINE_INLINE_VIRTUAL_TRACE() { }
|
|
|
| @@ -88,7 +86,7 @@ public:
|
| EffectModel::CompositeOperation m_composite;
|
| };
|
|
|
| - virtual PassOwnPtrWillBeRawPtr<PropertySpecificKeyframe> createPropertySpecificKeyframe(PropertyHandle) const = 0;
|
| + virtual PropertySpecificKeyframe* createPropertySpecificKeyframe(PropertyHandle) const = 0;
|
|
|
| protected:
|
| Keyframe()
|
|
|