| Index: cc/output/gl_renderer_unittest.cc
|
| diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
|
| index 97bd2d992ea4cbcd3b5ecece6401fe735ed04edd..c11cbc364dba52039f1ef50df9c8fc7495248f94 100644
|
| --- a/cc/output/gl_renderer_unittest.cc
|
| +++ b/cc/output/gl_renderer_unittest.cc
|
| @@ -2124,12 +2124,14 @@ class WaitSyncTokenCountingContext : public TestWebGraphicsContext3D {
|
|
|
| class MockOverlayScheduler {
|
| public:
|
| - MOCK_METHOD5(Schedule,
|
| + MOCK_METHOD7(Schedule,
|
| void(int plane_z_order,
|
| gfx::OverlayTransform plane_transform,
|
| + gfx::BufferFormat storage_format,
|
| unsigned overlay_texture_id,
|
| const gfx::Rect& display_bounds,
|
| - const gfx::RectF& uv_rect));
|
| + const gfx::RectF& uv_rect,
|
| + bool handle_scaling));
|
| };
|
|
|
| TEST_F(GLRendererTest, OverlaySyncTokensAreProcessed) {
|
| @@ -2199,9 +2201,11 @@ TEST_F(GLRendererTest, OverlaySyncTokensAreProcessed) {
|
| // Verify that overlay_quad actually gets turned into an overlay, and even
|
| // though it's not drawn, that its sync point is waited on.
|
| EXPECT_CALL(*context, waitSyncToken(MatchesSyncToken(sync_token))).Times(1);
|
| - EXPECT_CALL(overlay_scheduler,
|
| - Schedule(1, gfx::OVERLAY_TRANSFORM_NONE, _, viewport_rect,
|
| - BoundingRect(uv_top_left, uv_bottom_right))).Times(1);
|
| + EXPECT_CALL(
|
| + overlay_scheduler,
|
| + Schedule(1, gfx::OVERLAY_TRANSFORM_NONE, gfx::BufferFormat::BGRX_8888, _,
|
| + viewport_rect, BoundingRect(uv_top_left, uv_bottom_right), true))
|
| + .Times(1);
|
|
|
| renderer.DrawFrame(&render_passes_in_draw_order_, 1.f, viewport_rect,
|
| viewport_rect, false);
|
|
|