diff options
| author | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-29 22:55:35 +0000 |
|---|---|---|
| committer | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-29 22:55:35 +0000 |
| commit | ea3f5cf79a8e5d9cd9825bcbc71d448534350135 (patch) | |
| tree | f06dd247dde9b369b8f525495826e536c2b01809 /chrome/common/animation.h | |
| parent | c92913977f17839db50ddd561c1e7fa5a145bd3c (diff) | |
| download | chromium_src-ea3f5cf79a8e5d9cd9825bcbc71d448534350135.zip chromium_src-ea3f5cf79a8e5d9cd9825bcbc71d448534350135.tar.gz chromium_src-ea3f5cf79a8e5d9cd9825bcbc71d448534350135.tar.bz2 | |
Fix throb animation - a change to Animation::Start meant that Run() in a derived class was never being called. Throb animation depended on this.
BUG=3516
Review URL: http://codereview.chromium.org/8896
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4181 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/animation.h')
| -rw-r--r-- | chrome/common/animation.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/common/animation.h b/chrome/common/animation.h index 657512a..0b4dc6a 100644 --- a/chrome/common/animation.h +++ b/chrome/common/animation.h @@ -90,8 +90,8 @@ class Animation { void SetDuration(int duration); protected: - // Called when the animation's timer expires. - void Run(); + // Overriddable, called by Run. + virtual void Step(); // Calculates the timer interval from the constructor list. int CalculateInterval(int frame_rate); @@ -112,6 +112,10 @@ class Animation { base::RepeatingTimer<Animation> timer_; + private: + // Called when the animation's timer expires, calls Step. + void Run(); + DISALLOW_EVIL_CONSTRUCTORS(Animation); }; |