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

Unified Diff: Source/core/animation/animatable/AnimatableUnknown.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
Index: Source/core/animation/animatable/AnimatableUnknown.h
diff --git a/Source/core/animation/animatable/AnimatableUnknown.h b/Source/core/animation/animatable/AnimatableUnknown.h
index e767659e7c28418b55afef3b2e24723764395b58..a2e16a52670cad218921244ec0c5511eb58e7f4d 100644
--- a/Source/core/animation/animatable/AnimatableUnknown.h
+++ b/Source/core/animation/animatable/AnimatableUnknown.h
@@ -41,7 +41,7 @@ class AnimatableUnknown final : public AnimatableValue {
public:
virtual ~AnimatableUnknown() { }
- static PassRefPtrWillBeRawPtr<AnimatableUnknown> create(PassRefPtrWillBeRawPtr<CSSValue> value)
+ static PassRefPtrWillBeRawPtr<AnimatableUnknown> create(CSSValue value)
{
return adoptRefWillBeNoop(new AnimatableUnknown(value));
}
@@ -50,8 +50,8 @@ public:
return adoptRefWillBeNoop(new AnimatableUnknown(cssValuePool().createIdentifierValue(value)));
}
- PassRefPtrWillBeRawPtr<CSSValue> toCSSValue() const { return m_value; }
- CSSValueID toCSSValueID() const { return toCSSPrimitiveValue(m_value.get())->getValueID(); }
+ CSSValue toCSSValue() const { return m_value; }
+ CSSValueID toCSSValueID() const { return toCSSPrimitiveValue(m_value).getValueID(); }
DEFINE_INLINE_VIRTUAL_TRACE()
{
@@ -68,15 +68,14 @@ protected:
virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const override { return true; }
private:
- explicit AnimatableUnknown(PassRefPtrWillBeRawPtr<CSSValue> value)
+ explicit AnimatableUnknown(CSSValue value)
: m_value(value)
{
- ASSERT(m_value);
}
virtual AnimatableType type() const override { return TypeUnknown; }
virtual bool equalTo(const AnimatableValue*) const override;
- const RefPtrWillBeMember<CSSValue> m_value;
+ const CSSValue m_value;
};
DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableUnknown, isUnknown());
@@ -84,7 +83,7 @@ DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableUnknown, isUnknown());
inline bool AnimatableUnknown::equalTo(const AnimatableValue* value) const
{
const AnimatableUnknown* unknown = toAnimatableUnknown(value);
- return m_value == unknown->m_value || m_value->equals(*unknown->m_value);
+ return m_value.ptrEquals(unknown->m_value) || m_value.equals(unknown->m_value);
}
} // namespace blink
« no previous file with comments | « Source/core/animation/animatable/AnimatableImage.cpp ('k') | Source/core/animation/animatable/AnimatableUnknownTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698