Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / animation / AnimationEffect.h

diff --git a/src/third_party/WebKit/Source/core/animation/AnimationEffect.h b/src/third_party/WebKit/Source/core/animation/AnimationEffect.h
index 28751a9..8404576 100644 (file)
--- a/src/third_party/WebKit/Source/core/animation/AnimationEffect.h
+++ b/src/third_party/WebKit/Source/core/animation/AnimationEffect.h
@@ -31,32 +31,35 @@
 #ifndef AnimationEffect_h
 #define AnimationEffect_h
 
-#include "CSSPropertyNames.h"
-#include "heap/Handle.h"
+#include "bindings/core/v8/ScriptWrappable.h"
+#include "core/CSSPropertyNames.h"
+#include "platform/heap/Handle.h"
 #include "wtf/HashMap.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/RefCounted.h"
 
-namespace WebCore {
+namespace blink {
 
 class Interpolation;
 
-class AnimationEffect : public RefCountedWillBeGarbageCollectedFinalized<AnimationEffect> {
+class AnimationEffect : public RefCountedWillBeGarbageCollectedFinalized<AnimationEffect>, public ScriptWrappable {
+    DEFINE_WRAPPERTYPEINFO();
 public:
     enum CompositeOperation {
         CompositeReplace,
         CompositeAdd,
     };
 
+    AnimationEffect() { }
     virtual ~AnimationEffect() { }
     virtual PassOwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation> > > sample(int iteration, double fraction, double iterationDuration) const = 0;
 
     virtual bool affects(CSSPropertyID) { return false; };
     virtual bool isKeyframeEffectModel() const { return false; }
 
-    virtual void trace(Visitor*) = 0;
+    virtual void trace(Visitor*) { }
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // AnimationEffect_h