summaryrefslogtreecommitdiffstats
path: root/cc/animation/animation.h
diff options
context:
space:
mode:
authordstockwell@chromium.org <dstockwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-09 01:16:56 +0000
committerdstockwell@chromium.org <dstockwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-09 01:16:56 +0000
commitfdac56296ec1b7c862c64baa4606a983f9fb07e2 (patch)
tree7e341ebf26f7048f85ef1c4f83d6b0bcb2647666 /cc/animation/animation.h
parent2b697624c3d1312ec4c1fbbb1b77bb597a62f234 (diff)
downloadchromium_src-fdac56296ec1b7c862c64baa4606a983f9fb07e2.zip
chromium_src-fdac56296ec1b7c862c64baa4606a983f9fb07e2.tar.gz
chromium_src-fdac56296ec1b7c862c64baa4606a983f9fb07e2.tar.bz2
cc: Respect specified animation start times
Although setting of start time was exposed via the WebAnimation interface it was clobbered when starting impl side animations. This patch removes the unused Animation::Clone method and makes Animation::CloneAndInitialize always copy the specified start time, if any. Start times are not currently specified outside tests but will soon be used by blink for animations started through the Web Animations API. BUG=360471 Review URL: https://codereview.chromium.org/228203004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262582 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/animation/animation.h')
-rw-r--r--cc/animation/animation.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/cc/animation/animation.h b/cc/animation/animation.h
index f996c38..3cfc8bb 100644
--- a/cc/animation/animation.h
+++ b/cc/animation/animation.h
@@ -118,9 +118,7 @@ class CC_EXPORT Animation {
// of iterations, returns the relative time in the current iteration.
double TrimTimeToCurrentIteration(double monotonic_time) const;
- scoped_ptr<Animation> Clone() const;
- scoped_ptr<Animation> CloneAndInitialize(RunState initial_run_state,
- double start_time) const;
+ scoped_ptr<Animation> CloneAndInitialize(RunState initial_run_state) const;
bool is_controlling_instance() const { return is_controlling_instance_; }
void PushPropertiesTo(Animation* other) const;