sky/engine/core/animation/AnimationNode.h - Issue 922893002: Merge the Sky Engine changes from the SkyDart branch

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sky/engine/core/animation/AnimationNode.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:

Index: sky/engine/core/animation/AnimationNode.h

diff --git a/sky/engine/core/animation/AnimationNode.h b/sky/engine/core/animation/AnimationNode.h

index 2502aebfa0af40361282d3897e9d9fb926312eab..18d1b6322bfe6eb5077e8e1b30c1f422c3f51242 100644

--- a/sky/engine/core/animation/AnimationNode.h

+++ b/sky/engine/core/animation/AnimationNode.h

@@ -31,7 +31,7 @@

#ifndef SKY_ENGINE_CORE_ANIMATION_ANIMATIONNODE_H_

#define SKY_ENGINE_CORE_ANIMATION_ANIMATIONNODE_H_

-#include "sky/engine/bindings/core/v8/ScriptWrappable.h"

+#include "sky/engine/tonic/dart_wrappable.h"

#include "sky/engine/core/animation/Timing.h"

#include "sky/engine/wtf/OwnPtr.h"

#include "sky/engine/wtf/PassOwnPtr.h"

@@ -58,7 +58,7 @@ static inline double nullValue()

return std::numeric_limits<double>::quiet_NaN();

}

-class AnimationNode : public RefCounted<AnimationNode>, public ScriptWrappable {

+class AnimationNode : public RefCounted<AnimationNode>, public DartWrappable {

DEFINE_WRAPPERTYPEINFO();

friend class AnimationPlayer; // Calls attach/detach, updateInheritedTime.

public: