| Index: Source/core/animation/StringKeyframe.h
|
| diff --git a/Source/core/animation/StringKeyframe.h b/Source/core/animation/StringKeyframe.h
|
| index 839fe75da8166b60e590fee3985754a2b18195b9..95b5dc142c5af278d88d42e1adc4ac77124516b1 100644
|
| --- a/Source/core/animation/StringKeyframe.h
|
| +++ b/Source/core/animation/StringKeyframe.h
|
| @@ -22,9 +22,9 @@ public:
|
| }
|
|
|
| void setPropertyValue(CSSPropertyID, const String& value, Element*, StyleSheetContents*);
|
| - void setPropertyValue(CSSPropertyID, PassRefPtrWillBeRawPtr<CSSValue>);
|
| + void setPropertyValue(CSSPropertyID, CSSValue);
|
| void setPropertyValue(const QualifiedName&, const String& value, Element*);
|
| - CSSValue* cssPropertyValue(CSSPropertyID property) const
|
| + CSSValue cssPropertyValue(CSSPropertyID property) const
|
| {
|
| int index = m_propertySet->findPropertyIndex(property);
|
| RELEASE_ASSERT(index >= 0);
|
| @@ -41,9 +41,9 @@ public:
|
|
|
| class CSSPropertySpecificKeyframe : public Keyframe::PropertySpecificKeyframe {
|
| public:
|
| - CSSPropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, CSSValue*, EffectModel::CompositeOperation);
|
| + CSSPropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, NullableCSSValue, EffectModel::CompositeOperation);
|
|
|
| - CSSValue* value() const { return m_value.get(); }
|
| + NullableCSSValue value() const { return m_value; }
|
|
|
| virtual void populateAnimatableValue(CSSPropertyID, Element&, const ComputedStyle* baseStyle) const;
|
| virtual const PassRefPtrWillBeRawPtr<AnimatableValue> getAnimatableValue() const override final { return m_animatableValueCache.get(); }
|
| @@ -55,16 +55,16 @@ public:
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| private:
|
| - CSSPropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, CSSValue*);
|
| + CSSPropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, NullableCSSValue);
|
|
|
| virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> cloneWithOffset(double offset) const;
|
| virtual bool isCSSPropertySpecificKeyframe() const override { return true; }
|
|
|
| - static bool createInterpolationsFromCSSValues(CSSPropertyID, CSSValue* fromCSSValue, CSSValue* toCSSValue, Element*, OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>>& interpolations);
|
| + static bool createInterpolationsFromCSSValues(CSSPropertyID, CSSValue fromCSSValue, CSSValue toCSSValue, Element*, OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>>& interpolations);
|
|
|
| void populateAnimatableValueCaches(CSSPropertyID, Keyframe::PropertySpecificKeyframe&, Element*, CSSValue& fromCSSValue, CSSValue& toCSSValue) const;
|
|
|
| - RefPtrWillBeMember<CSSValue> m_value;
|
| + NullableCSSValue m_value;
|
| mutable RefPtrWillBeMember<AnimatableValue> m_animatableValueCache;
|
| };
|
|
|
|
|