Index: cc/trees/layer_tree_host_unittest_animation.cc |
diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc |
index 70610f7e6f9ec032cfc7dc07ad54e33666e810ba..74bfefaf2663afb6fdfcc3a516962bf39d2c754f 100644 |
--- a/cc/trees/layer_tree_host_unittest_animation.cc |
+++ b/cc/trees/layer_tree_host_unittest_animation.cc |
@@ -8,6 +8,7 @@ |
#include "cc/animation/layer_animation_controller.h" |
#include "cc/animation/scroll_offset_animation_curve.h" |
#include "cc/animation/timing_function.h" |
+#include "cc/base/time_util.h" |
#include "cc/layers/layer.h" |
#include "cc/layers/layer_impl.h" |
#include "cc/test/animation_test_common.h" |
@@ -568,7 +569,7 @@ class LayerTreeHostAnimationTestSynchronizeAnimationStartTimes |
layer_animation_controller(); |
Animation* animation = |
controller->GetAnimation(Animation::Opacity); |
- main_start_time_ = animation->start_time(); |
+ main_start_time_ = TimeUtil::TicksInSecondsF(animation->start_time()); |
controller->RemoveAnimation(animation->id()); |
if (impl_start_time_ > 0.0) |
@@ -586,7 +587,7 @@ class LayerTreeHostAnimationTestSynchronizeAnimationStartTimes |
if (!animation) |
return; |
- impl_start_time_ = animation->start_time(); |
+ impl_start_time_ = TimeUtil::TicksInSecondsF(animation->start_time()); |
controller->RemoveAnimation(animation->id()); |
if (main_start_time_ > 0.0) |
@@ -1368,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(TimeUtil::TicksInSecondsF(anim->start_time()), 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(TimeUtil::TicksInSecondsF(anim->start_time()), 0); |
} |
} |
} |