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

Unified Diff: sky/engine/core/animation/AnimationEffect.h

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 | « sky/engine/core/animation/Animation.idl ('k') | sky/engine/core/animation/AnimationNode.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/animation/AnimationEffect.h
diff --git a/sky/engine/core/animation/AnimationEffect.h b/sky/engine/core/animation/AnimationEffect.h
index 5830c337f9d0e7d24c57f5d374c5c01d50071113..ca7f43e1345291b5aef39645e831831a8a0df6dc 100644
--- a/sky/engine/core/animation/AnimationEffect.h
+++ b/sky/engine/core/animation/AnimationEffect.h
@@ -32,7 +32,7 @@
#define SKY_ENGINE_CORE_ANIMATION_ANIMATIONEFFECT_H_
#include "gen/sky/core/CSSPropertyNames.h"
-#include "sky/engine/bindings/core/v8/ScriptWrappable.h"
+#include "sky/engine/tonic/dart_wrappable.h"
#include "sky/engine/wtf/PassOwnPtr.h"
#include "sky/engine/wtf/RefCounted.h"
@@ -40,7 +40,7 @@ namespace blink {
class Interpolation;
-class AnimationEffect : public RefCounted<AnimationEffect>, public ScriptWrappable {
+class AnimationEffect : public RefCounted<AnimationEffect>, public DartWrappable {
DEFINE_WRAPPERTYPEINFO();
public:
enum CompositeOperation {
« no previous file with comments | « sky/engine/core/animation/Animation.idl ('k') | sky/engine/core/animation/AnimationNode.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698