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

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

Issue 204183002: Remove CompositableValue. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@opacity
Patch Set: Created 6 years, 9 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 | « no previous file | Source/core/animation/AnimationEffect.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/AnimatableValue.h
diff --git a/Source/core/animation/AnimatableValue.h b/Source/core/animation/AnimatableValue.h
index 77933ba9fb9e2484ab01e1b20acabccd98bef25b..58ce56e3cf02a7d787e17f18b3c832655c501856 100644
--- a/Source/core/animation/AnimatableValue.h
+++ b/Source/core/animation/AnimatableValue.h
@@ -31,13 +31,12 @@
#ifndef AnimatableValue_h
#define AnimatableValue_h
-#include "core/animation/AnimationEffect.h"
#include "core/css/CSSValue.h"
#include "wtf/RefCounted.h"
namespace WebCore {
-class AnimatableValue : public AnimationEffect::CompositableValue {
+class AnimatableValue : public RefCounted<AnimatableValue> {
public:
virtual ~AnimatableValue() { }
@@ -61,10 +60,6 @@ public:
return equals(&value);
}
- virtual bool dependsOnUnderlyingValue() const OVERRIDE FINAL { return false; }
- virtual PassRefPtr<AnimatableValue> compositeOnto(const AnimatableValue*) const OVERRIDE FINAL { return takeConstRef(this); }
- virtual bool isAnimatableValue() const { return true; }
-
bool isClipPathOperation() const { return type() == TypeClipPathOperation; }
bool isColor() const { return type() == TypeColor; }
bool isDouble() const { return type() == TypeDouble; }
@@ -142,8 +137,6 @@ private:
#define DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(thisType, predicate) \
DEFINE_TYPE_CASTS(thisType, AnimatableValue, value, value->predicate, value.predicate)
-DEFINE_TYPE_CASTS(AnimatableValue, AnimationEffect::CompositableValue, value, value->isAnimatableValue(), value.isAnimatableValue());
-
} // namespace WebCore
#endif // AnimatableValue_h
« no previous file with comments | « no previous file | Source/core/animation/AnimationEffect.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698