| 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 58fa36692e68674f6ac0fbd5c277b78a7285f204..a6bb32734386e35581e92241b6aba8ef9956ac68 100644
|
| --- a/cc/layers/delegated_renderer_layer_impl_unittest.cc
|
| +++ b/cc/layers/delegated_renderer_layer_impl_unittest.cc
|
| @@ -25,6 +25,7 @@
|
| #include "cc/trees/layer_tree_impl.h"
|
| #include "cc/trees/single_thread_proxy.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| +#include "ui/gfx/frame_time.h"
|
| #include "ui/gfx/transform.h"
|
|
|
| namespace cc {
|
| @@ -165,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, base::TimeTicks::Now());
|
| + host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -201,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, base::TimeTicks::Now());
|
| + host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -228,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, base::TimeTicks::Now());
|
| + host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -262,7 +263,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple,
|
| EXPECT_TRANSFORMATION_MATRIX_EQ(
|
| gfx::Transform(), frame.render_passes[1]->quad_list[0]->quadTransform());
|
|
|
| - host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| + host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -274,7 +275,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, base::TimeTicks::Now());
|
| + host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -289,7 +290,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple, DoesOwnARenderSurfaceForOpacity) {
|
| // render surface.
|
| EXPECT_TRUE(delegated_renderer_layer_->render_surface());
|
|
|
| - host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| + host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -307,7 +308,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple,
|
| // render surface.
|
| EXPECT_TRUE(delegated_renderer_layer_->render_surface());
|
|
|
| - host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| + host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -354,7 +355,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, base::TimeTicks::Now());
|
| + host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -391,7 +392,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, base::TimeTicks::Now());
|
| + host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -416,7 +417,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, base::TimeTicks::Now());
|
| + host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -448,7 +449,7 @@ TEST_F(DelegatedRendererLayerImplTestOwnSurface,
|
| EXPECT_TRANSFORMATION_MATRIX_EQ(
|
| gfx::Transform(), frame.render_passes[1]->quad_list[0]->quadTransform());
|
|
|
| - host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| + host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -682,7 +683,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsUnclipped_NoSurface) {
|
| expected,
|
| contrib_delegated_shared_quad_state->content_to_target_transform);
|
|
|
| - host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| + host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -745,7 +746,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsClipped_NoSurface) {
|
| expected,
|
| contrib_delegated_shared_quad_state->content_to_target_transform);
|
|
|
| - host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| + host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -801,7 +802,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsUnclipped_Surface) {
|
| expected,
|
| contrib_delegated_shared_quad_state->content_to_target_transform);
|
|
|
| - host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| + host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -856,7 +857,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsClipped_Surface) {
|
| expected,
|
| contrib_delegated_shared_quad_state->content_to_target_transform);
|
|
|
| - host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| + host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -1032,7 +1033,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, base::TimeTicks::Now());
|
| + host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -1061,7 +1062,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
|
| // Quads came with a clip rect.
|
| EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped);
|
|
|
| - host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| + host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -1091,7 +1092,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, base::TimeTicks::Now());
|
| + host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -1120,7 +1121,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
|
| // Quads came with a clip rect.
|
| EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped);
|
|
|
| - host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| + host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -1149,7 +1150,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, base::TimeTicks::Now());
|
| + host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -1179,7 +1180,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
|
| // Quads came with a clip rect.
|
| EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped);
|
|
|
| - host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| + host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -1208,7 +1209,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, base::TimeTicks::Now());
|
| + host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -1239,7 +1240,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, base::TimeTicks::Now());
|
| + host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
| @@ -1292,7 +1293,7 @@ TEST_F(DelegatedRendererLayerImplTest, InvalidRenderPassDrawQuad) {
|
| EXPECT_EQ(DrawQuad::SOLID_COLOR,
|
| frame.render_passes[0]->quad_list[0]->material);
|
|
|
| - host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
|
| + host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
|
| host_impl_->DidDrawAllLayers(frame);
|
| }
|
|
|
|
|