Index: cc/layers/delegated_renderer_layer_impl_unittest.cc |
diff --git a/cc/layers/delegated_renderer_layer_impl_unittest.cc b/cc/layers/delegated_renderer_layer_impl_unittest.cc |
index fbaf8bbf24f5bb44292e10dd046f72fdbf1000b4..915fcd13577bfdc8def42f072efc29436d616900 100644 |
--- a/cc/layers/delegated_renderer_layer_impl_unittest.cc |
+++ b/cc/layers/delegated_renderer_layer_impl_unittest.cc |
@@ -166,7 +166,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple, AddsContributingRenderPasses) { |
EXPECT_EQ(gfx::Rect(7, 7, 7, 7).ToString(), |
frame.render_passes[2]->output_rect.ToString()); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -202,7 +202,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple, |
EXPECT_EQ(gfx::Rect(0, 0, 6, 6).ToString(), |
frame.render_passes[1]->quad_list[0]->rect.ToString()); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -229,7 +229,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple, AddsQuadsToTargetRenderPass) { |
EXPECT_EQ(gfx::Rect(0, 0, 15, 15).ToString(), |
frame.render_passes[3]->quad_list[1]->rect.ToString()); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -260,7 +260,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple, |
EXPECT_TRANSFORMATION_MATRIX_EQ( |
gfx::Transform(), frame.render_passes[1]->quad_list[0]->quadTransform()); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -292,7 +292,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple, RenderPassTransformIsModified) { |
transform * seven_eight, |
frame.render_passes[2]->transform_to_root_target); |
- host_impl_->DrawLayers(&frame, base::TimeTicks::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -304,7 +304,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple, DoesNotOwnARenderSurface) { |
// has no need to be a RenderSurface for the quads it carries. |
EXPECT_FALSE(delegated_renderer_layer_->render_surface()); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -319,7 +319,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple, DoesOwnARenderSurfaceForOpacity) { |
// render surface. |
EXPECT_TRUE(delegated_renderer_layer_->render_surface()); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -337,7 +337,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple, |
// render surface. |
EXPECT_TRUE(delegated_renderer_layer_->render_surface()); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -384,7 +384,7 @@ TEST_F(DelegatedRendererLayerImplTestOwnSurface, AddsRenderPasses) { |
EXPECT_EQ(gfx::Rect(7, 7, 7, 7).ToString(), |
frame.render_passes[2]->output_rect.ToString()); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -421,7 +421,7 @@ TEST_F(DelegatedRendererLayerImplTestOwnSurface, |
EXPECT_EQ(gfx::Rect(0, 0, 6, 6).ToString(), |
frame.render_passes[1]->quad_list[0]->rect.ToString()); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -446,7 +446,7 @@ TEST_F(DelegatedRendererLayerImplTestOwnSurface, AddsQuadsToTargetRenderPass) { |
EXPECT_EQ(gfx::Rect(7, 7, 7, 7).ToString(), |
frame.render_passes[3]->quad_list[0]->rect.ToString()); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -475,7 +475,7 @@ TEST_F(DelegatedRendererLayerImplTestOwnSurface, |
EXPECT_TRANSFORMATION_MATRIX_EQ( |
gfx::Transform(), frame.render_passes[1]->quad_list[0]->quadTransform()); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -733,7 +733,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsUnclipped_NoSurface) { |
expected, |
contrib_delegated_shared_quad_state->content_to_target_transform); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -792,7 +792,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsClipped_NoSurface) { |
expected, |
contrib_delegated_shared_quad_state->content_to_target_transform); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -840,7 +840,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsUnclipped_Surface) { |
expected, |
contrib_delegated_shared_quad_state->content_to_target_transform); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -887,7 +887,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsClipped_Surface) { |
expected, |
contrib_delegated_shared_quad_state->content_to_target_transform); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -926,7 +926,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, MismatchedDeviceScaleFactor) { |
EXPECT_TRANSFORMATION_MATRIX_EQ( |
expected, root_delegated_shared_quad_state->content_to_target_transform); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -1123,7 +1123,7 @@ TEST_F(DelegatedRendererLayerImplTestClip, |
// Quads are clipped to the delegated renderer layer. |
EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -1152,7 +1152,7 @@ TEST_F(DelegatedRendererLayerImplTestClip, |
// Quads came with a clip rect. |
EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -1182,7 +1182,7 @@ TEST_F(DelegatedRendererLayerImplTestClip, |
// Quads are clipped to the delegated renderer layer. |
EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -1211,7 +1211,7 @@ TEST_F(DelegatedRendererLayerImplTestClip, |
// Quads came with a clip rect. |
EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -1240,7 +1240,7 @@ TEST_F(DelegatedRendererLayerImplTestClip, |
// clip rect is ignored, and they are not set as clipped. |
EXPECT_FALSE(root_delegated_shared_quad_state->is_clipped); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -1270,7 +1270,7 @@ TEST_F(DelegatedRendererLayerImplTestClip, |
// Quads came with a clip rect. |
EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -1299,7 +1299,7 @@ TEST_F(DelegatedRendererLayerImplTestClip, |
// clip rect is ignored, and they are not set as clipped. |
EXPECT_FALSE(root_delegated_shared_quad_state->is_clipped); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -1330,7 +1330,7 @@ TEST_F(DelegatedRendererLayerImplTestClip, QuadsClipped_LayerClipped_Surface) { |
// Quads came with a clip rect. |
EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |
@@ -1383,7 +1383,7 @@ TEST_F(DelegatedRendererLayerImplTest, InvalidRenderPassDrawQuad) { |
EXPECT_EQ(DrawQuad::SOLID_COLOR, |
frame.render_passes[0]->quad_list[0]->material); |
- host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
+ host_impl_->DrawLayers(&frame); |
host_impl_->DidDrawAllLayers(frame); |
} |