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

Unified Diff: Source/core/animation/animatable/AnimatableUnknown.h

Issue 1225553002: CSSValue Immediates: Make CSSPrimitiveValue a container (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@cssvalue_patch_1
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 a2e16a52670cad218921244ec0c5511eb58e7f4d..91d46e4410a5bb0156425c42eef0bbce43154563 100644
--- a/Source/core/animation/animatable/AnimatableUnknown.h
+++ b/Source/core/animation/animatable/AnimatableUnknown.h
@@ -33,6 +33,7 @@
#include "core/CSSValueKeywords.h"
#include "core/animation/animatable/AnimatableValue.h"
+#include "core/css/CSSValue.h"
#include "core/css/CSSValuePool.h"
namespace blink {
@@ -41,7 +42,7 @@ class AnimatableUnknown final : public AnimatableValue {
public:
virtual ~AnimatableUnknown() { }
- static PassRefPtrWillBeRawPtr<AnimatableUnknown> create(CSSValue value)
+ static PassRefPtrWillBeRawPtr<AnimatableUnknown> create(CSSPrimitiveValue value)
{
return adoptRefWillBeNoop(new AnimatableUnknown(value));
}
@@ -50,7 +51,7 @@ public:
return adoptRefWillBeNoop(new AnimatableUnknown(cssValuePool().createIdentifierValue(value)));
}
- CSSValue toCSSValue() const { return m_value; }
+ CSSPrimitiveValue toCSSValue() const { return toCSSPrimitiveValue(m_value); }
CSSValueID toCSSValueID() const { return toCSSPrimitiveValue(m_value).getValueID(); }
DEFINE_INLINE_VIRTUAL_TRACE()
@@ -68,7 +69,7 @@ protected:
virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const override { return true; }
private:
- explicit AnimatableUnknown(CSSValue value)
+ explicit AnimatableUnknown(CSSPrimitiveValue value)
: m_value(value)
{
}
« no previous file with comments | « Source/core/animation/VisibilityStyleInterpolation.cpp ('k') | Source/core/animation/animatable/AnimatableUnknownTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698