| Index: Source/core/animation/AnimatableValueKeyframe.h
|
| diff --git a/Source/core/animation/AnimatableValueKeyframe.h b/Source/core/animation/AnimatableValueKeyframe.h
|
| index 2327ee94562ad05a45deb4d42ff0d546677b1aeb..1647f8e8c563bd931a3f885c140ab5feb02b27fe 100644
|
| --- a/Source/core/animation/AnimatableValueKeyframe.h
|
| +++ b/Source/core/animation/AnimatableValueKeyframe.h
|
| @@ -12,8 +12,11 @@ namespace WebCore {
|
|
|
| class AnimatableValueKeyframe : public Keyframe {
|
| public:
|
| - static PassRefPtr<AnimatableValueKeyframe> create() { return adoptRef(new AnimatableValueKeyframe); }
|
| - void setPropertyValue(CSSPropertyID property, PassRefPtr<AnimatableValue> value)
|
| + static PassRefPtrWillBeRawPtr<AnimatableValueKeyframe> create()
|
| + {
|
| + return adoptRefWillBeNoop(new AnimatableValueKeyframe);
|
| + }
|
| + void setPropertyValue(CSSPropertyID property, PassRefPtrWillBeRawPtr<AnimatableValue> value)
|
| {
|
| m_propertyValues.add(property, value);
|
| }
|
| @@ -25,36 +28,39 @@ public:
|
| }
|
| virtual PropertySet properties() const OVERRIDE;
|
|
|
| + virtual void trace(Visitor*) OVERRIDE;
|
| +
|
| class PropertySpecificKeyframe : public Keyframe::PropertySpecificKeyframe {
|
| public:
|
| PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, const AnimatableValue*, AnimationEffect::CompositeOperation);
|
|
|
| AnimatableValue* value() const { return m_value.get(); }
|
|
|
| - virtual PassOwnPtr<Keyframe::PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const OVERRIDE FINAL;
|
| - virtual PassRefPtr<Interpolation> createInterpolation(CSSPropertyID, WebCore::Keyframe::PropertySpecificKeyframe* end) const OVERRIDE FINAL;
|
| + virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const OVERRIDE FINAL;
|
| + virtual PassRefPtrWillBeRawPtr<Interpolation> createInterpolation(CSSPropertyID, WebCore::Keyframe::PropertySpecificKeyframe* end) const OVERRIDE FINAL;
|
| +
|
| + virtual void trace(Visitor*) OVERRIDE;
|
|
|
| private:
|
| - PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, PassRefPtr<AnimatableValue>);
|
| + PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, PassRefPtrWillBeRawPtr<AnimatableValue>);
|
|
|
| - virtual PassOwnPtr<Keyframe::PropertySpecificKeyframe> cloneWithOffset(double offset) const OVERRIDE;
|
| + virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> cloneWithOffset(double offset) const OVERRIDE;
|
| virtual bool isAnimatableValuePropertySpecificKeyframe() const OVERRIDE { return true; }
|
|
|
| - RefPtr<AnimatableValue> m_value;
|
| + RefPtrWillBeMember<AnimatableValue> m_value;
|
| };
|
|
|
| private:
|
| - AnimatableValueKeyframe()
|
| - { }
|
| + AnimatableValueKeyframe() { }
|
|
|
| AnimatableValueKeyframe(const AnimatableValueKeyframe& copyFrom);
|
|
|
| virtual PassRefPtrWillBeRawPtr<Keyframe> clone() const OVERRIDE;
|
| - virtual PassOwnPtr<Keyframe::PropertySpecificKeyframe> createPropertySpecificKeyframe(CSSPropertyID) const OVERRIDE;
|
| + virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> createPropertySpecificKeyframe(CSSPropertyID) const OVERRIDE;
|
|
|
| virtual bool isAnimatableValueKeyframe() const OVERRIDE { return true; }
|
|
|
| - typedef HashMap<CSSPropertyID, RefPtr<AnimatableValue> > PropertyValueMap;
|
| + typedef HashMap<CSSPropertyID, RefPtrWillBeMember<AnimatableValue> > PropertyValueMap;
|
| PropertyValueMap m_propertyValues;
|
| };
|
|
|
|
|