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

Unified Diff: cc/animation/animation_registrar.h

Issue 1584743002: CC Animation: Replace AnimiationEventsVector with AnimiationEvents class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 11 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 | « cc/animation/animation_host.cc ('k') | cc/animation/animation_registrar.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/animation_registrar.h
diff --git a/cc/animation/animation_registrar.h b/cc/animation/animation_registrar.h
index 5cb21e96a023bca5f435c785b203113a64578008..45e49ef0e8552996db48f542ad03a3000478ad9c 100644
--- a/cc/animation/animation_registrar.h
+++ b/cc/animation/animation_registrar.h
@@ -9,11 +9,12 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "cc/animation/animation_events.h"
+#include "base/time/time.h"
#include "cc/base/cc_export.h"
namespace cc {
+class AnimationEvents;
class LayerAnimationController;
class CC_EXPORT AnimationRegistrar {
@@ -67,13 +68,10 @@ class CC_EXPORT AnimationRegistrar {
bool ActivateAnimations();
bool AnimateLayers(base::TimeTicks monotonic_time);
bool UpdateAnimationState(bool start_ready_animations,
- AnimationEventsVector* events);
+ AnimationEvents* events);
- scoped_ptr<AnimationEventsVector> CreateEvents() {
- return make_scoped_ptr(new AnimationEventsVector());
- }
-
- void SetAnimationEvents(scoped_ptr<AnimationEventsVector> events);
+ scoped_ptr<AnimationEvents> CreateEvents();
+ void SetAnimationEvents(scoped_ptr<AnimationEvents> events);
private:
AnimationRegistrar();
« no previous file with comments | « cc/animation/animation_host.cc ('k') | cc/animation/animation_registrar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698