sky/engine/core/animation/AnimationTimeline.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/AnimationTimeline.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/AnimationTimeline.h

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

index d991a52c94e47eb5ef303bac07d37b408ef21d51..982dbb053a4ac5da6d08954cd21f07724bba3756 100644

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

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

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

#ifndef SKY_ENGINE_CORE_ANIMATION_ANIMATIONTIMELINE_H_

#define SKY_ENGINE_CORE_ANIMATION_ANIMATIONTIMELINE_H_

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

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

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

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

#include "sky/engine/core/dom/Element.h"

@@ -47,7 +47,7 @@ class Document;

class AnimationNode;

// AnimationTimeline is constructed and owned by Document, and tied to its lifecycle.

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

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

DEFINE_WRAPPERTYPEINFO();

public:

class PlatformTiming {