diff options
author | sivagunturi@chromium.org <sivagunturi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-15 17:31:36 +0000 |
---|---|---|
committer | sivagunturi@chromium.org <sivagunturi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-15 17:31:36 +0000 |
commit | ac22516a1df6e674ca7c730eee4d22286f96a257 (patch) | |
tree | 96fb2af51d9b501840c7018d9cd38a9921b803cf /cc/trees/layer_tree_host_unittest_animation.cc | |
parent | 2590cbb39144fec19f67e86493392123ea67d90f (diff) | |
download | chromium_src-ac22516a1df6e674ca7c730eee4d22286f96a257.zip chromium_src-ac22516a1df6e674ca7c730eee4d22286f96a257.tar.gz chromium_src-ac22516a1df6e674ca7c730eee4d22286f96a257.tar.bz2 |
CC::LayerAnimationController should use TimeTicks and
TimeDelta to represent time.
As of now complete CC/animation code uses double type
for time durations. This patch replaces double with
TimeTicks where time stamps is used and TimeDeltas
where offset is used.
BUG=178171
Review URL: https://codereview.chromium.org/231133002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270718 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/trees/layer_tree_host_unittest_animation.cc')
-rw-r--r-- | cc/trees/layer_tree_host_unittest_animation.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc index 8e11556..9e02822 100644 --- a/cc/trees/layer_tree_host_unittest_animation.cc +++ b/cc/trees/layer_tree_host_unittest_animation.cc @@ -568,7 +568,8 @@ class LayerTreeHostAnimationTestSynchronizeAnimationStartTimes layer_animation_controller(); Animation* animation = controller->GetAnimation(Animation::Opacity); - main_start_time_ = animation->start_time(); + main_start_time_ = + (animation->start_time() - base::TimeTicks()).InSecondsF(); controller->RemoveAnimation(animation->id()); if (impl_start_time_ > 0.0) @@ -586,7 +587,8 @@ class LayerTreeHostAnimationTestSynchronizeAnimationStartTimes if (!animation) return; - impl_start_time_ = animation->start_time(); + impl_start_time_ = + (animation->start_time() - base::TimeTicks()).InSecondsF(); controller->RemoveAnimation(animation->id()); if (main_start_time_ > 0.0) @@ -1367,10 +1369,10 @@ class LayerTreeHostAnimationTestAddAnimationAfterAnimating int id = ((*iter).second->id()); if (id == host_impl->RootLayer()->id()) { Animation* anim = (*iter).second->GetAnimation(Animation::Transform); - EXPECT_GT(anim->start_time(), 0); + EXPECT_GT((anim->start_time() - base::TimeTicks()).InSecondsF(), 0); } else if (id == host_impl->RootLayer()->children()[0]->id()) { Animation* anim = (*iter).second->GetAnimation(Animation::Opacity); - EXPECT_GT(anim->start_time(), 0); + EXPECT_GT((anim->start_time() - base::TimeTicks()).InSecondsF(), 0); } } } |