summaryrefslogtreecommitdiffstats
path: root/cc/animation/animation_registrar.h
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-20 01:42:32 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-20 01:42:32 +0000
commit3dbdc605f73b784f97fb38d2a9c931b90883db9f (patch)
treeffc91f4875456dc94403147dbb20cfa24fa0ac45 /cc/animation/animation_registrar.h
parentffe65f40321c7eb3b4ddfa4f2516226a0c02da31 (diff)
downloadchromium_src-3dbdc605f73b784f97fb38d2a9c931b90883db9f.zip
chromium_src-3dbdc605f73b784f97fb38d2a9c931b90883db9f.tar.gz
chromium_src-3dbdc605f73b784f97fb38d2a9c931b90883db9f.tar.bz2
cc: Chromify AnimationRegistrar
R=jamesr@chromium.org BUG=none Review URL: https://chromiumcodereview.appspot.com/12617016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189194 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/animation/animation_registrar.h')
-rw-r--r--cc/animation/animation_registrar.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/cc/animation/animation_registrar.h b/cc/animation/animation_registrar.h
index 5d1eb44..5bba0d1 100644
--- a/cc/animation/animation_registrar.h
+++ b/cc/animation/animation_registrar.h
@@ -18,7 +18,7 @@ class CC_EXPORT AnimationRegistrar {
public:
typedef base::hash_map<int, LayerAnimationController*> AnimationControllerMap;
- static scoped_ptr<AnimationRegistrar> create() {
+ static scoped_ptr<AnimationRegistrar> Create() {
return make_scoped_ptr(new AnimationRegistrar());
}
@@ -30,18 +30,18 @@ class CC_EXPORT AnimationRegistrar {
// Registers the given animation controller as active. An active animation
// controller is one that has a running animation that needs to be ticked.
- void DidActivateAnimationController(LayerAnimationController*);
+ void DidActivateAnimationController(LayerAnimationController* controller);
// Unregisters the given animation controller. When this happens, the
// animation controller will no longer be ticked (since it's not active). It
// is not an error to call this function with a deactivated controller.
- void DidDeactivateAnimationController(LayerAnimationController*);
+ void DidDeactivateAnimationController(LayerAnimationController* controller);
// Registers the given controller as alive.
- void RegisterAnimationController(LayerAnimationController*);
+ void RegisterAnimationController(LayerAnimationController* controller);
// Unregisters the given controller as alive.
- void UnregisterAnimationController(LayerAnimationController*);
+ void UnregisterAnimationController(LayerAnimationController* controller);
const AnimationControllerMap& active_animation_controllers() const {
return active_animation_controllers_;