| 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 947c657f0fb4207f35cb51e9b1b86375f99fcc7e..cc45c53f19e3320962ac7cc39c1c80566b23c9a8 100644
|
| --- a/cc/layers/delegated_renderer_layer_impl_unittest.cc
|
| +++ b/cc/layers/delegated_renderer_layer_impl_unittest.cc
|
| @@ -186,7 +186,7 @@ TEST_F(DelegatedRendererLayerImplTest,
|
| // contributing render passes and its own render pass.
|
| ASSERT_EQ(4u, frame.render_passes.size());
|
|
|
| - host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| + host_impl_->DrawLayers(&frame);
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
| {
|
| @@ -208,7 +208,7 @@ TEST_F(DelegatedRendererLayerImplTest,
|
| // DelegatedRendererLayer added two contributing passes.
|
| ASSERT_EQ(1u, frame.render_passes.size());
|
|
|
| - host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| + host_impl_->DrawLayers(&frame);
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
| }
|
| @@ -267,7 +267,7 @@ TEST_F(DelegatedRendererLayerImplTest,
|
| // contributing render passes and its own render pass.
|
| ASSERT_EQ(4u, frame.render_passes.size());
|
|
|
| - host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| + host_impl_->DrawLayers(&frame);
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
| {
|
| @@ -292,7 +292,7 @@ TEST_F(DelegatedRendererLayerImplTest,
|
| // has contributing render passes.
|
| ASSERT_EQ(1u, frame.render_passes.size());
|
|
|
| - host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| + host_impl_->DrawLayers(&frame);
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
| }
|
| @@ -326,7 +326,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);
|
| }
|
|
|
| @@ -362,7 +362,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple,
|
| EXPECT_EQ(gfx::Rect(0, 0, 6, 6).ToString(),
|
| frame.render_passes[1]->quad_list.front()->rect.ToString());
|
|
|
| - host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| + host_impl_->DrawLayers(&frame);
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -389,7 +389,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple, AddsQuadsToTargetRenderPass) {
|
| EXPECT_EQ(gfx::Rect(0, 0, 15, 15).ToString(),
|
| frame.render_passes[3]->quad_list.ElementAt(1)->rect.ToString());
|
|
|
| - host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| + host_impl_->DrawLayers(&frame);
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -424,7 +424,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple,
|
| gfx::Transform(),
|
| frame.render_passes[1]->quad_list.front()->quadTransform());
|
|
|
| - host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| + host_impl_->DrawLayers(&frame);
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -456,7 +456,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);
|
| }
|
|
|
| @@ -503,7 +503,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);
|
| }
|
|
|
| @@ -541,7 +541,7 @@ TEST_F(DelegatedRendererLayerImplTestOwnSurface,
|
| EXPECT_EQ(gfx::Rect(0, 0, 6, 6).ToString(),
|
| frame.render_passes[1]->quad_list.front()->rect.ToString());
|
|
|
| - host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| + host_impl_->DrawLayers(&frame);
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -566,7 +566,7 @@ TEST_F(DelegatedRendererLayerImplTestOwnSurface, AddsQuadsToTargetRenderPass) {
|
| EXPECT_EQ(gfx::Rect(7, 7, 7, 7).ToString(),
|
| frame.render_passes[3]->quad_list.front()->rect.ToString());
|
|
|
| - host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| + host_impl_->DrawLayers(&frame);
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -600,7 +600,7 @@ TEST_F(DelegatedRendererLayerImplTestOwnSurface,
|
| gfx::Transform(),
|
| frame.render_passes[1]->quad_list.front()->quadTransform());
|
|
|
| - host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| + host_impl_->DrawLayers(&frame);
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -848,7 +848,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);
|
| }
|
|
|
| @@ -907,7 +907,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);
|
| }
|
|
|
| @@ -956,7 +956,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);
|
| }
|
|
|
| @@ -1004,7 +1004,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);
|
| }
|
|
|
| @@ -1043,7 +1043,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);
|
| }
|
|
|
| @@ -1230,7 +1230,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);
|
| }
|
|
|
| @@ -1259,7 +1259,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);
|
| }
|
|
|
| @@ -1289,7 +1289,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);
|
| }
|
|
|
| @@ -1318,7 +1318,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);
|
| }
|
|
|
| @@ -1347,7 +1347,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);
|
| }
|
|
|
| @@ -1377,7 +1377,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);
|
| }
|
|
|
| @@ -1406,7 +1406,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);
|
| }
|
|
|
| @@ -1437,7 +1437,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);
|
| }
|
|
|
|
|