Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3061)

Unified Diff: cc/trees/layer_tree_host_impl_unittest.cc

Issue 178103004: Removing the use of base::Time inside the LayerTreeHost system. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updating for code which has been split out. Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/trees/layer_tree_host_impl_unittest.cc
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index aa439014b310991d08bd723f093024af09332801..d8968276978f4e29dab86c602fd150439f06fd90 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -1074,16 +1074,16 @@ TEST_F(LayerTreeHostImplTest, PageScaleAnimation) {
host_impl_->StartPageScaleAnimation(gfx::Vector2d(), false, 2.f, duration);
did_request_redraw_ = false;
- host_impl_->Animate(start_time, base::Time());
+ host_impl_->Animate(start_time);
EXPECT_TRUE(did_request_redraw_);
did_request_redraw_ = false;
- host_impl_->Animate(halfway_through_animation, base::Time());
+ host_impl_->Animate(halfway_through_animation);
EXPECT_TRUE(did_request_redraw_);
did_request_redraw_ = false;
did_request_commit_ = false;
- host_impl_->Animate(end_time, base::Time());
+ host_impl_->Animate(end_time);
EXPECT_TRUE(did_request_commit_);
scoped_ptr<ScrollAndScaleSet> scroll_info =
@@ -1102,12 +1102,12 @@ TEST_F(LayerTreeHostImplTest, PageScaleAnimation) {
host_impl_->StartPageScaleAnimation(
gfx::Vector2d(25, 25), true, min_page_scale, duration);
did_request_redraw_ = false;
- host_impl_->Animate(start_time, base::Time());
+ host_impl_->Animate(start_time);
EXPECT_TRUE(did_request_redraw_);
did_request_redraw_ = false;
did_request_commit_ = false;
- host_impl_->Animate(end_time, base::Time());
+ host_impl_->Animate(end_time);
EXPECT_TRUE(did_request_redraw_);
EXPECT_TRUE(did_request_commit_);
@@ -1143,10 +1143,10 @@ TEST_F(LayerTreeHostImplTest, PageScaleAnimationNoOp) {
scroll_layer->SetScrollOffset(gfx::Vector2d(50, 50));
host_impl_->StartPageScaleAnimation(gfx::Vector2d(), true, 1.f, duration);
- host_impl_->Animate(start_time, base::Time());
- host_impl_->Animate(halfway_through_animation, base::Time());
+ host_impl_->Animate(start_time);
+ host_impl_->Animate(halfway_through_animation);
EXPECT_TRUE(did_request_redraw_);
- host_impl_->Animate(end_time, base::Time());
+ host_impl_->Animate(end_time);
EXPECT_TRUE(did_request_commit_);
scoped_ptr<ScrollAndScaleSet> scroll_info =
@@ -5988,7 +5988,7 @@ const int LayerTreeHostImplWithTopControlsTest::top_controls_height_ = 50;
TEST_F(LayerTreeHostImplWithTopControlsTest, NoIdleAnimations) {
SetupScrollAndContentsLayers(gfx::Size(100, 100))
->SetScrollOffset(gfx::Vector2d(0, 10));
- host_impl_->Animate(base::TimeTicks(), base::Time());
+ host_impl_->Animate(base::TimeTicks());
EXPECT_FALSE(did_request_redraw_);
}

Powered by Google App Engine
This is Rietveld 408576698