| Index: Source/core/animation/animatable/AnimatableValueKeyframe.h
|
| diff --git a/Source/core/animation/animatable/AnimatableValueKeyframe.h b/Source/core/animation/animatable/AnimatableValueKeyframe.h
|
| index 6421f164e677fd580e56c62efe26b5d5f02567c3..58f2e26eff2ad89d9bfa39c2a5e7f9aa2dda28a6 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);
|
| }
|
| @@ -35,21 +35,21 @@ public:
|
| public:
|
| PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, const AnimatableValue*, EffectModel::CompositeOperation);
|
|
|
| - AnimatableValue* value() const { return m_value.get(); }
|
| - const PassRefPtrWillBeRawPtr<AnimatableValue> getAnimatableValue() const final { return m_value; }
|
| + AnimatableValue* value() const { return m_value; }
|
| + AnimatableValue* getAnimatableValue() const final { return m_value; }
|
|
|
| - PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const final;
|
| - PassRefPtrWillBeRawPtr<Interpolation> maybeCreateInterpolation(PropertyHandle, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle*) const final;
|
| + Keyframe::PropertySpecificKeyframe* neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const final;
|
| + Interpolation* maybeCreateInterpolation(PropertyHandle, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle*) const final;
|
|
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| private:
|
| - PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, PassRefPtrWillBeRawPtr<AnimatableValue>);
|
| + PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, AnimatableValue*);
|
|
|
| - PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> cloneWithOffset(double offset) const override;
|
| + Keyframe::PropertySpecificKeyframe* cloneWithOffset(double offset) const override;
|
| bool isAnimatableValuePropertySpecificKeyframe() const override { return true; }
|
|
|
| - RefPtrWillBeMember<AnimatableValue> m_value;
|
| + Member<AnimatableValue> m_value;
|
| };
|
|
|
| private:
|
| @@ -57,12 +57,12 @@ private:
|
|
|
| AnimatableValueKeyframe(const AnimatableValueKeyframe& copyFrom);
|
|
|
| - PassRefPtrWillBeRawPtr<Keyframe> clone() const override;
|
| - PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> createPropertySpecificKeyframe(PropertyHandle) const override;
|
| + Keyframe* clone() const override;
|
| + Keyframe::PropertySpecificKeyframe* createPropertySpecificKeyframe(PropertyHandle) const override;
|
|
|
| bool isAnimatableValueKeyframe() const override { return true; }
|
|
|
| - using PropertyValueMap = WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<AnimatableValue>>;
|
| + using PropertyValueMap = HeapHashMap<CSSPropertyID, Member<AnimatableValue>>;
|
| PropertyValueMap m_propertyValues;
|
| };
|
|
|
|
|