| Index: cc/delegated_renderer_layer_impl_unittest.cc
|
| diff --git a/cc/delegated_renderer_layer_impl_unittest.cc b/cc/delegated_renderer_layer_impl_unittest.cc
|
| index def29c1550520c388a889014e76ea13f7f83d8da..fe9358d2bdd82d4b88b6ba3bee7fb08071a3093f 100644
|
| --- a/cc/delegated_renderer_layer_impl_unittest.cc
|
| +++ b/cc/delegated_renderer_layer_impl_unittest.cc
|
| @@ -165,7 +165,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);
|
| + host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -201,7 +201,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);
|
| + host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -228,7 +228,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);
|
| + host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -262,7 +262,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple,
|
| EXPECT_TRANSFORMATION_MATRIX_EQ(
|
| gfx::Transform(), frame.render_passes[1]->quad_list[0]->quadTransform());
|
|
|
| - host_impl_->DrawLayers(&frame);
|
| + host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -274,7 +274,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);
|
| + host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -289,7 +289,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple, DoesOwnARenderSurfaceForOpacity) {
|
| // render surface.
|
| EXPECT_TRUE(delegated_renderer_layer_->render_surface());
|
|
|
| - host_impl_->DrawLayers(&frame);
|
| + host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -307,7 +307,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple,
|
| // render surface.
|
| EXPECT_TRUE(delegated_renderer_layer_->render_surface());
|
|
|
| - host_impl_->DrawLayers(&frame);
|
| + host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -354,7 +354,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);
|
| + host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -391,7 +391,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);
|
| + host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -416,7 +416,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);
|
| + host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -448,7 +448,7 @@ TEST_F(DelegatedRendererLayerImplTestOwnSurface,
|
| EXPECT_TRANSFORMATION_MATRIX_EQ(
|
| gfx::Transform(), frame.render_passes[1]->quad_list[0]->quadTransform());
|
|
|
| - host_impl_->DrawLayers(&frame);
|
| + host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -679,7 +679,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsUnclipped_NoSurface) {
|
| expected,
|
| contrib_delegated_shared_quad_state->content_to_target_transform);
|
|
|
| - host_impl_->DrawLayers(&frame);
|
| + host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -738,7 +738,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsClipped_NoSurface) {
|
| expected,
|
| contrib_delegated_shared_quad_state->content_to_target_transform);
|
|
|
| - host_impl_->DrawLayers(&frame);
|
| + host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -793,7 +793,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsUnclipped_Surface) {
|
| expected,
|
| contrib_delegated_shared_quad_state->content_to_target_transform);
|
|
|
| - host_impl_->DrawLayers(&frame);
|
| + host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -847,7 +847,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsClipped_Surface) {
|
| expected,
|
| contrib_delegated_shared_quad_state->content_to_target_transform);
|
|
|
| - host_impl_->DrawLayers(&frame);
|
| + host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -1026,7 +1026,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);
|
| + host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -1057,7 +1057,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
|
| // Quads came with a clip rect.
|
| EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped);
|
|
|
| - host_impl_->DrawLayers(&frame);
|
| + host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -1089,7 +1089,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);
|
| + host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -1120,7 +1120,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
|
| // Quads came with a clip rect.
|
| EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped);
|
|
|
| - host_impl_->DrawLayers(&frame);
|
| + host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -1151,7 +1151,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);
|
| + host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -1183,7 +1183,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
|
| // Quads came with a clip rect.
|
| EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped);
|
|
|
| - host_impl_->DrawLayers(&frame);
|
| + host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -1214,7 +1214,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);
|
| + host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -1247,7 +1247,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);
|
| + host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
|
|