Index: Source/core/animation/animatable/AnimatableValueKeyframe.h |
diff --git a/Source/core/animation/animatable/AnimatableValueKeyframe.h b/Source/core/animation/animatable/AnimatableValueKeyframe.h |
index e1533dbea4d7be341a274e70a384009159d3b29a..5df39158f9ee4a30eb556ac1b5b0efbfaa0e59ba 100644 |
--- a/Source/core/animation/animatable/AnimatableValueKeyframe.h |
+++ b/Source/core/animation/animatable/AnimatableValueKeyframe.h |
@@ -13,11 +13,11 @@ namespace blink { |
class CORE_EXPORT AnimatableValueKeyframe : public Keyframe { |
public: |
- static PassRefPtrWillBeRawPtr<AnimatableValueKeyframe> create() |
+ static AnimatableValueKeyframe* create() |
{ |
- return adoptRefWillBeNoop(new AnimatableValueKeyframe); |
+ return new AnimatableValueKeyframe; |
} |
- void setPropertyValue(CSSPropertyID property, PassRefPtrWillBeRawPtr<AnimatableValue> value) |
+ void setPropertyValue(CSSPropertyID property, AnimatableValue* value) |
{ |
m_propertyValues.set(property, value); |
} |
@@ -36,20 +36,20 @@ public: |
PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, const AnimatableValue*, EffectModel::CompositeOperation); |
AnimatableValue* value() const { return m_value.get(); } |
- virtual const PassRefPtrWillBeRawPtr<AnimatableValue> getAnimatableValue() const override final { return m_value; } |
+ virtual const AnimatableValue* getAnimatableValue() const override final { return m_value; } |
- virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const override final; |
- virtual PassRefPtrWillBeRawPtr<Interpolation> maybeCreateInterpolation(PropertyHandle, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle*) const override final; |
+ virtual Keyframe::PropertySpecificKeyframe* neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const override final; |
+ virtual Interpolation* maybeCreateInterpolation(PropertyHandle, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle*) const override final; |
DECLARE_VIRTUAL_TRACE(); |
private: |
- PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, PassRefPtrWillBeRawPtr<AnimatableValue>); |
+ PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, AnimatableValue*); |
- virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> cloneWithOffset(double offset) const override; |
+ virtual Keyframe::PropertySpecificKeyframe* cloneWithOffset(double offset) const override; |
virtual bool isAnimatableValuePropertySpecificKeyframe() const override { return true; } |
- RefPtrWillBeMember<AnimatableValue> m_value; |
+ Member<AnimatableValue> m_value; |
}; |
private: |
@@ -57,12 +57,12 @@ private: |
AnimatableValueKeyframe(const AnimatableValueKeyframe& copyFrom); |
- virtual PassRefPtrWillBeRawPtr<Keyframe> clone() const override; |
- virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> createPropertySpecificKeyframe(PropertyHandle) const override; |
+ virtual Keyframe* clone() const override; |
+ virtual Keyframe::PropertySpecificKeyframe* createPropertySpecificKeyframe(PropertyHandle) const override; |
virtual bool isAnimatableValueKeyframe() const override { return true; } |
- using PropertyValueMap = WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<AnimatableValue>>; |
+ using PropertyValueMap = HeapHashMap<CSSPropertyID, Member<AnimatableValue>>; |
PropertyValueMap m_propertyValues; |
}; |