Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(442)

Unified Diff: Source/core/animation/StringKeyframe.h

Issue 1164573002: CSSValue Immediates: Change CSSValue to an object instead of a pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/animation/ShadowStyleInterpolationTest.cpp ('k') | Source/core/animation/StringKeyframe.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
};
« no previous file with comments | « Source/core/animation/ShadowStyleInterpolationTest.cpp ('k') | Source/core/animation/StringKeyframe.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698