| Index: third_party/WebKit/Source/core/animation/Keyframe.h
|
| diff --git a/third_party/WebKit/Source/core/animation/Keyframe.h b/third_party/WebKit/Source/core/animation/Keyframe.h
|
| index a37a07e4da2b607cc5316ad86607480c2026c69c..542bdfc5e991377f7e66b41be88db26205b941db 100644
|
| --- a/third_party/WebKit/Source/core/animation/Keyframe.h
|
| +++ b/third_party/WebKit/Source/core/animation/Keyframe.h
|
| @@ -56,7 +56,7 @@ public:
|
| virtual bool isStringKeyframe() const { return false; }
|
|
|
| // Represents a property-value pair in a keyframe.
|
| - class PropertySpecificKeyframe {
|
| + class PropertySpecificKeyframe : public RefCounted<PropertySpecificKeyframe> {
|
| USING_FAST_MALLOC(PropertySpecificKeyframe);
|
| WTF_MAKE_NONCOPYABLE(PropertySpecificKeyframe);
|
| public:
|
| @@ -66,7 +66,7 @@ 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 PassOwnPtr<PropertySpecificKeyframe> cloneWithOffset(double offset) const = 0;
|
| + virtual PassRefPtr<PropertySpecificKeyframe> cloneWithOffset(double offset) const = 0;
|
|
|
| // FIXME: Remove this once CompositorAnimations no longer depends on AnimatableValues
|
| virtual bool populateAnimatableValue(CSSPropertyID, Element&, const ComputedStyle* baseStyle, bool force) const { return false; }
|
| @@ -76,7 +76,7 @@ public:
|
| virtual bool isCSSPropertySpecificKeyframe() const { return false; }
|
| virtual bool isSVGPropertySpecificKeyframe() const { return false; }
|
|
|
| - virtual PassOwnPtr<PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const = 0;
|
| + virtual PassRefPtr<PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const = 0;
|
| virtual PassRefPtr<Interpolation> maybeCreateInterpolation(PropertyHandle, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle* baseStyle) const = 0;
|
|
|
| protected:
|
| @@ -87,7 +87,7 @@ public:
|
| EffectModel::CompositeOperation m_composite;
|
| };
|
|
|
| - virtual PassOwnPtr<PropertySpecificKeyframe> createPropertySpecificKeyframe(PropertyHandle) const = 0;
|
| + virtual PassRefPtr<PropertySpecificKeyframe> createPropertySpecificKeyframe(PropertyHandle) const = 0;
|
|
|
| protected:
|
| Keyframe()
|
|
|