| 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 7ab8b5a18a44b62799628873fb77c87a7c3d8d37..0a50b8ec24a46e1dd11c77ec78eb2acf26cd7216 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.renderPasses[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.renderPasses[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.renderPasses[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.renderPasses[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.renderPasses[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.renderPasses[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.renderPasses[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.renderPasses[1]->quad_list[0]->quadTransform());
|
|
|
| - host_impl_->drawLayers(frame);
|
| + host_impl_->drawLayers(frame, base::TimeTicks::Now());
|
| host_impl_->didDrawAllLayers(frame);
|
| }
|
|
|
| @@ -677,7 +677,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);
|
| }
|
|
|
| @@ -736,7 +736,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);
|
| }
|
|
|
| @@ -791,7 +791,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);
|
| }
|
|
|
| @@ -845,7 +845,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);
|
| }
|
|
|
| @@ -1024,7 +1024,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);
|
| }
|
|
|
| @@ -1055,7 +1055,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);
|
| }
|
|
|
| @@ -1087,7 +1087,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);
|
| }
|
|
|
| @@ -1118,7 +1118,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);
|
| }
|
|
|
| @@ -1149,7 +1149,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);
|
| }
|
|
|
| @@ -1179,7 +1179,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);
|
| }
|
|
|
| @@ -1210,7 +1210,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);
|
| }
|
|
|
| @@ -1243,7 +1243,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);
|
| }
|
|
|
|
|