| Index: Source/core/animation/Keyframe.h
|
| diff --git a/Source/core/animation/Keyframe.h b/Source/core/animation/Keyframe.h
|
| index d4820a4f84136dbe3109f39886b1a1ec840cbb90..8b2075771b1105e935dfc0fbbe4da98441fd3ef5 100644
|
| --- a/Source/core/animation/Keyframe.h
|
| +++ b/Source/core/animation/Keyframe.h
|
| @@ -27,7 +27,7 @@ public:
|
| void setEasing(PassRefPtr<TimingFunction> easing) { m_easing = easing; }
|
| TimingFunction* easing() const { return m_easing.get(); }
|
|
|
| - static bool compareOffsets(const RefPtrWillBeRawPtr<Keyframe>&, const RefPtrWillBeRawPtr<Keyframe>&);
|
| + static bool compareOffsets(const RefPtrWillBeMember<Keyframe>&, const RefPtrWillBeMember<Keyframe>&);
|
| virtual PropertySet properties() const = 0;
|
|
|
| virtual PassRefPtrWillBeRawPtr<Keyframe> clone() const = 0;
|
| @@ -41,7 +41,7 @@ public:
|
| virtual bool isAnimatableValueKeyframe() const { return false; }
|
| virtual bool isStringKeyframe() const { return false; }
|
|
|
| - void trace(Visitor*) { }
|
| + virtual void trace(Visitor*) { }
|
|
|
| class PropertySpecificKeyframe : public NoBaseWillBeGarbageCollectedFinalized<PropertySpecificKeyframe> {
|
| public:
|
| @@ -49,13 +49,15 @@ public:
|
| double offset() const { return m_offset; }
|
| TimingFunction* easing() const { return m_easing.get(); }
|
| AnimationEffect::CompositeOperation composite() const { return m_composite; }
|
| - virtual PassOwnPtr<PropertySpecificKeyframe> cloneWithOffset(double offset) const = 0;
|
| + virtual PassOwnPtrWillBeRawPtr<PropertySpecificKeyframe> cloneWithOffset(double offset) const = 0;
|
|
|
| virtual bool isAnimatableValuePropertySpecificKeyframe() const { return false; }
|
| virtual bool isStringPropertySpecificKeyframe() const { return false; }
|
|
|
| - virtual PassOwnPtr<PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const = 0;
|
| - virtual PassRefPtr<Interpolation> createInterpolation(CSSPropertyID, WebCore::Keyframe::PropertySpecificKeyframe* end) const = 0;
|
| + virtual PassOwnPtrWillBeRawPtr<PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const = 0;
|
| + virtual PassRefPtrWillBeRawPtr<Interpolation> createInterpolation(CSSPropertyID, WebCore::Keyframe::PropertySpecificKeyframe* end) const = 0;
|
| +
|
| + virtual void trace(Visitor*) = 0;
|
|
|
| protected:
|
| PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, AnimationEffect::CompositeOperation);
|
| @@ -65,8 +67,7 @@ public:
|
| AnimationEffect::CompositeOperation m_composite;
|
| };
|
|
|
| - virtual PassOwnPtr<PropertySpecificKeyframe> createPropertySpecificKeyframe(CSSPropertyID) const = 0;
|
| -
|
| + virtual PassOwnPtrWillBeRawPtr<PropertySpecificKeyframe> createPropertySpecificKeyframe(CSSPropertyID) const = 0;
|
|
|
| protected:
|
| Keyframe()
|
| @@ -87,8 +88,6 @@ protected:
|
| RefPtr<TimingFunction> m_easing;
|
| };
|
|
|
| -typedef Keyframe::PropertySpecificKeyframe PropertySpecificKeyframe;
|
| -
|
| }
|
|
|
| #endif
|
|
|