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

Unified Diff: sky/engine/core/animation/AnimationNodeTiming.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/AnimationNode.h ('k') | sky/engine/core/animation/AnimationPlayer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/animation/AnimationNodeTiming.h
diff --git a/sky/engine/core/animation/AnimationNodeTiming.h b/sky/engine/core/animation/AnimationNodeTiming.h
index 4c56862589ba94fc274d09b88f522ebe253d1e7c..5f45006ff5d13c03727d2fb25d78fda3929ebac9 100644
--- a/sky/engine/core/animation/AnimationNodeTiming.h
+++ b/sky/engine/core/animation/AnimationNodeTiming.h
@@ -5,15 +5,15 @@
#ifndef SKY_ENGINE_CORE_ANIMATION_ANIMATIONNODETIMING_H_
#define SKY_ENGINE_CORE_ANIMATION_ANIMATIONNODETIMING_H_
-#include "sky/engine/bindings/core/v8/Nullable.h"
-#include "sky/engine/bindings/core/v8/ScriptWrappable.h"
+#include "sky/engine/tonic/dart_wrappable.h"
+#include "sky/engine/bindings2/nullable.h"
#include "sky/engine/core/animation/AnimationNode.h"
#include "sky/engine/wtf/RefCounted.h"
#include "sky/engine/wtf/text/WTFString.h"
namespace blink {
-class AnimationNodeTiming : public RefCounted<AnimationNodeTiming>, public ScriptWrappable {
+class AnimationNodeTiming : public RefCounted<AnimationNodeTiming>, public DartWrappable {
DEFINE_WRAPPERTYPEINFO();
public:
static PassRefPtr<AnimationNodeTiming> create(AnimationNode* parent);
« no previous file with comments | « sky/engine/core/animation/AnimationNode.h ('k') | sky/engine/core/animation/AnimationPlayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698