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

Unified Diff: sky/engine/core/animation/Animation.cpp

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.h ('k') | sky/engine/core/animation/Animation.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/animation/Animation.cpp
diff --git a/sky/engine/core/animation/Animation.cpp b/sky/engine/core/animation/Animation.cpp
index c6a09046a90b17ab408d7c4dddb3cbb39a5c558c..048ea2255ba07bc81e92526030a39dca62c68f41 100644
--- a/sky/engine/core/animation/Animation.cpp
+++ b/sky/engine/core/animation/Animation.cpp
@@ -31,8 +31,7 @@
#include "sky/engine/config.h"
#include "sky/engine/core/animation/Animation.h"
-#include "sky/engine/bindings/core/v8/Dictionary.h"
-#include "sky/engine/bindings/core/v8/ExceptionState.h"
+#include "sky/engine/bindings2/exception_state.h"
#include "sky/engine/core/animation/ActiveAnimations.h"
#include "sky/engine/core/animation/AnimationHelpers.h"
#include "sky/engine/core/animation/AnimationPlayer.h"
@@ -49,29 +48,13 @@ PassRefPtr<Animation> Animation::create(Element* target, PassRefPtr<AnimationEff
return adoptRef(new Animation(target, effect, timing, priority, eventDelegate));
}
-PassRefPtr<Animation> Animation::create(Element* element, PassRefPtr<AnimationEffect> effect, const Dictionary& timingInputDictionary)
+PassRefPtr<Animation> Animation::create(Element* element, double duration, ExceptionState&)
{
- return create(element, effect, TimingInput::convert(timingInputDictionary));
+ return create(element, PassRefPtr<AnimationEffect>(), TimingInput::convert(duration));
}
-PassRefPtr<Animation> Animation::create(Element* element, PassRefPtr<AnimationEffect> effect, double duration)
+PassRefPtr<Animation> Animation::create(Element* element, ExceptionState& es)
{
- return create(element, effect, TimingInput::convert(duration));
-}
-PassRefPtr<Animation> Animation::create(Element* element, PassRefPtr<AnimationEffect> effect)
-{
- return create(element, effect, Timing());
-}
-PassRefPtr<Animation> Animation::create(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, const Dictionary& timingInputDictionary, ExceptionState& exceptionState)
-{
- return create(element, EffectInput::convert(element, keyframeDictionaryVector, exceptionState), TimingInput::convert(timingInputDictionary));
-}
-PassRefPtr<Animation> Animation::create(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, double duration, ExceptionState& exceptionState)
-{
- return create(element, EffectInput::convert(element, keyframeDictionaryVector, exceptionState), TimingInput::convert(duration));
-}
-PassRefPtr<Animation> Animation::create(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState& exceptionState)
-{
- return create(element, EffectInput::convert(element, keyframeDictionaryVector, exceptionState), Timing());
+ return create(element, 0.0, es);
}
Animation::Animation(Element* target, PassRefPtr<AnimationEffect> effect, const Timing& timing, Priority priority, PassOwnPtr<EventDelegate> eventDelegate)
« no previous file with comments | « sky/engine/core/animation/Animation.h ('k') | sky/engine/core/animation/Animation.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698