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

Unified Diff: sky/engine/core/animation/Animation.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/BUILD.gn ('k') | sky/engine/core/animation/Animation.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/animation/Animation.h
diff --git a/sky/engine/core/animation/Animation.h b/sky/engine/core/animation/Animation.h
index 5a5f415d67931ede38ca5ca101256e2f8734f1a6..f6d8172e16af1bd5074960e2e70554a6187b665a 100644
--- a/sky/engine/core/animation/Animation.h
+++ b/sky/engine/core/animation/Animation.h
@@ -39,7 +39,6 @@
namespace blink {
-class Dictionary;
class Element;
class ExceptionState;
class SampledEffect;
@@ -49,14 +48,10 @@ class Animation final : public AnimationNode {
public:
enum Priority { DefaultPriority, TransitionPriority };
- static PassRefPtr<Animation> create(Element*, PassRefPtr<AnimationEffect>, const Timing&, Priority = DefaultPriority, PassOwnPtr<EventDelegate> = nullptr);
+ static PassRefPtr<Animation> create(Element*, PassRefPtr<AnimationEffect> effect, const Timing&, Priority = DefaultPriority, PassOwnPtr<EventDelegate> = nullptr);
// Web Animations API Bindings constructors.
- static PassRefPtr<Animation> create(Element*, PassRefPtr<AnimationEffect>, const Dictionary& timingInputDictionary);
- static PassRefPtr<Animation> create(Element*, PassRefPtr<AnimationEffect>, double duration);
- static PassRefPtr<Animation> create(Element*, PassRefPtr<AnimationEffect>);
- static PassRefPtr<Animation> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, const Dictionary& timingInputDictionary, ExceptionState&);
- static PassRefPtr<Animation> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, double duration, ExceptionState&);
- static PassRefPtr<Animation> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState&);
+ static PassRefPtr<Animation> create(Element*, ExceptionState&);
+ static PassRefPtr<Animation> create(Element*, double duration, ExceptionState&);
virtual ~Animation();
@@ -81,7 +76,7 @@ protected:
virtual double calculateTimeToEffectChange(bool forwards, double inheritedTime, double timeToNextIteration) const override;
private:
- Animation(Element*, PassRefPtr<AnimationEffect>, const Timing&, Priority, PassOwnPtr<EventDelegate>);
+ Animation(Element*, PassRefPtr<AnimationEffect> effect, const Timing&, Priority, PassOwnPtr<EventDelegate>);
RawPtr<Element> m_target;
RefPtr<AnimationEffect> m_effect;
« no previous file with comments | « sky/engine/core/BUILD.gn ('k') | sky/engine/core/animation/Animation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698