| Index: cc/trees/layer_tree_host_unittest.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
|
| index 5c69225993170b1277045e0fce6bab3677863e5e..672e9c49027f6fdafe90207f5166633bfce4cd86 100644
|
| --- a/cc/trees/layer_tree_host_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_unittest.cc
|
| @@ -772,7 +772,7 @@ class LayerTreeHostTestFrameTimeUpdatesAfterActivationFails
|
|
|
| if (frame_count_with_pending_tree_ == 1) {
|
| EXPECT_EQ(first_frame_time_.ToInternalValue(), 0);
|
| - first_frame_time_ = impl->CurrentFrameTimeTicks();
|
| + first_frame_time_ = impl->CurrentBeginFrameArgs().frame_time;
|
| } else if (frame_count_with_pending_tree_ == 2) {
|
| impl->BlockNotifyReadyToActivateForTesting(false);
|
| }
|
| @@ -782,7 +782,7 @@ class LayerTreeHostTestFrameTimeUpdatesAfterActivationFails
|
| if (frame_count_with_pending_tree_ > 1) {
|
| EXPECT_NE(first_frame_time_.ToInternalValue(), 0);
|
| EXPECT_NE(first_frame_time_.ToInternalValue(),
|
| - impl->CurrentFrameTimeTicks().ToInternalValue());
|
| + impl->CurrentBeginFrameArgs().frame_time.ToInternalValue());
|
| EndTest();
|
| return;
|
| }
|
| @@ -821,7 +821,7 @@ class LayerTreeHostTestFrameTimeUpdatesAfterDraw : public LayerTreeHostTest {
|
| virtual void DrawLayersOnThread(LayerTreeHostImpl* impl) OVERRIDE {
|
| frame_++;
|
| if (frame_ == 1) {
|
| - first_frame_time_ = impl->CurrentFrameTimeTicks();
|
| + first_frame_time_ = impl->CurrentBeginFrameArgs().frame_time;
|
| impl->SetNeedsRedraw();
|
|
|
| // Since we might use a low-resolution clock on Windows, we need to
|
| @@ -832,7 +832,7 @@ class LayerTreeHostTestFrameTimeUpdatesAfterDraw : public LayerTreeHostTest {
|
| return;
|
| }
|
|
|
| - EXPECT_NE(first_frame_time_, impl->CurrentFrameTimeTicks());
|
| + EXPECT_NE(first_frame_time_, impl->CurrentBeginFrameArgs().frame_time);
|
| EndTest();
|
| }
|
|
|
| @@ -4934,7 +4934,7 @@ class LayerTreeHostTestContinuousPainting : public LayerTreeHostTest {
|
| base::Unretained(this)));
|
| }
|
|
|
| - virtual void Animate(base::TimeTicks monotonic_time) OVERRIDE {
|
| + virtual void BeginMainFrame(const BeginFrameArgs& args) OVERRIDE {
|
| child_layer_->SetNeedsDisplay();
|
| }
|
|
|
|
|