diff options
| author | dongseong.hwang@intel.com <dongseong.hwang@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-18 03:02:46 +0000 |
|---|---|---|
| committer | dongseong.hwang@intel.com <dongseong.hwang@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-18 03:02:46 +0000 |
| commit | 47788db62a753d17a594343ddb5ea04ac7edb627 (patch) | |
| tree | 16806d722a749a7bc57cc4dc68c0cdf54e6087b1 /cc/animation/animation.h | |
| parent | 1a7227164b0d13ff69f111b63497bea673a92bac (diff) | |
| download | chromium_src-47788db62a753d17a594343ddb5ea04ac7edb627.zip chromium_src-47788db62a753d17a594343ddb5ea04ac7edb627.tar.gz chromium_src-47788db62a753d17a594343ddb5ea04ac7edb627.tar.bz2 | |
Remove Animation::InstanceType.
A cloned Animation instance is always controlling instance, so
Animation::InstanceType enum is useless.
BUG=290217
Review URL: https://codereview.chromium.org/26205006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229287 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/animation/animation.h')
| -rw-r--r-- | cc/animation/animation.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/cc/animation/animation.h b/cc/animation/animation.h index 58da1e5..9946298 100644 --- a/cc/animation/animation.h +++ b/cc/animation/animation.h @@ -121,14 +121,8 @@ class CC_EXPORT Animation { // of iterations, returns the relative time in the current iteration. double TrimTimeToCurrentIteration(double monotonic_time) const; - enum InstanceType { - ControllingInstance = 0, - NonControllingInstance - }; - - scoped_ptr<Animation> Clone(InstanceType instance_type) const; - scoped_ptr<Animation> CloneAndInitialize(InstanceType instance_type, - RunState initial_run_state, + scoped_ptr<Animation> Clone() const; + scoped_ptr<Animation> CloneAndInitialize(RunState initial_run_state, double start_time) const; bool is_controlling_instance() const { return is_controlling_instance_; } |