Index: Source/core/animation/StringKeyframe.h |
diff --git a/Source/core/animation/StringKeyframe.h b/Source/core/animation/StringKeyframe.h |
index 1b958f584e401916788c438ec34407af57de65e3..89d60824339e12e041296d97af33c02be30d0375 100644 |
--- a/Source/core/animation/StringKeyframe.h |
+++ b/Source/core/animation/StringKeyframe.h |
@@ -16,9 +16,9 @@ class StyleSheetContents; |
class StringKeyframe : public Keyframe { |
public: |
- static PassRefPtrWillBeRawPtr<StringKeyframe> create() |
+ static StringKeyframe* create() |
{ |
- return adoptRefWillBeNoop(new StringKeyframe); |
+ return new StringKeyframe; |
} |
void setPropertyValue(CSSPropertyID, const String& value, Element*, StyleSheetContents*); |
@@ -46,28 +46,28 @@ public: |
CSSValue* value() const { return m_value.get(); } |
virtual void populateAnimatableValue(CSSPropertyID, Element&, const ComputedStyle* baseStyle) const; |
- const PassRefPtrWillBeRawPtr<AnimatableValue> getAnimatableValue() const final { return m_animatableValueCache.get(); } |
- void setAnimatableValue(PassRefPtrWillBeRawPtr<AnimatableValue> value) { m_animatableValueCache = value; } |
+ AnimatableValue* getAnimatableValue() const final { return m_animatableValueCache.get(); } |
+ void setAnimatableValue(AnimatableValue* value) { m_animatableValueCache = value; } |
bool isNeutral() 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* baseStyle) const final; |
+ Keyframe::PropertySpecificKeyframe* neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const final; |
+ Interpolation* maybeCreateInterpolation(PropertyHandle, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle* baseStyle) const final; |
DECLARE_VIRTUAL_TRACE(); |
private: |
CSSPropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, CSSValue*); |
- virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> cloneWithOffset(double offset) const; |
+ virtual Keyframe::PropertySpecificKeyframe* cloneWithOffset(double offset) const; |
bool isCSSPropertySpecificKeyframe() const override { return true; } |
- PassRefPtrWillBeRawPtr<Interpolation> createLegacyStyleInterpolation(CSSPropertyID, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle* baseStyle) const; |
- static bool createInterpolationsFromCSSValues(CSSPropertyID, CSSValue* fromCSSValue, CSSValue* toCSSValue, Element*, OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>>& interpolations); |
+ Interpolation* createLegacyStyleInterpolation(CSSPropertyID, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle* baseStyle) const; |
+ static bool createInterpolationsFromCSSValues(CSSPropertyID, CSSValue* fromCSSValue, CSSValue* toCSSValue, Element*, HeapVector<Member<Interpolation>>* interpolations); |
void populateAnimatableValueCaches(CSSPropertyID, Keyframe::PropertySpecificKeyframe&, Element*, CSSValue& fromCSSValue, CSSValue& toCSSValue) const; |
RefPtrWillBeMember<CSSValue> m_value; |
- mutable RefPtrWillBeMember<AnimatableValue> m_animatableValueCache; |
+ mutable Member<AnimatableValue> m_animatableValueCache; |
}; |
class SVGPropertySpecificKeyframe : public Keyframe::PropertySpecificKeyframe { |
@@ -76,12 +76,12 @@ public: |
const String& value() const { return m_value; } |
- PassOwnPtrWillBeRawPtr<PropertySpecificKeyframe> cloneWithOffset(double offset) const final; |
+ PropertySpecificKeyframe* cloneWithOffset(double offset) const final; |
- const PassRefPtrWillBeRawPtr<AnimatableValue> getAnimatableValue() const final { return nullptr; } |
+ AnimatableValue* getAnimatableValue() const final { return nullptr; } |
- PassOwnPtrWillBeRawPtr<PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const final; |
- PassRefPtrWillBeRawPtr<Interpolation> maybeCreateInterpolation(PropertyHandle, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle* baseStyle) const final; |
+ PropertySpecificKeyframe* neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const final; |
+ Interpolation* maybeCreateInterpolation(PropertyHandle, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle* baseStyle) const final; |
DECLARE_VIRTUAL_TRACE(); |
@@ -100,8 +100,8 @@ private: |
StringKeyframe(const StringKeyframe& copyFrom); |
- PassRefPtrWillBeRawPtr<Keyframe> clone() const override; |
- PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> createPropertySpecificKeyframe(PropertyHandle) const override; |
+ Keyframe* clone() const override; |
+ Keyframe::PropertySpecificKeyframe* createPropertySpecificKeyframe(PropertyHandle) const override; |
bool isStringKeyframe() const override { return true; } |