| Index: cc/output/overlay_unittest.cc
|
| diff --git a/cc/output/overlay_unittest.cc b/cc/output/overlay_unittest.cc
|
| index 5590ec3d53eeb809fa4aa3b81c1e7f63ed511e15..9090621ea16d491590072bd4655383e009c5025d 100644
|
| --- a/cc/output/overlay_unittest.cc
|
| +++ b/cc/output/overlay_unittest.cc
|
| @@ -775,7 +775,10 @@ class OverlayInfoRendererGL : public GLRenderer {
|
| 0),
|
| expect_overlays_(false) {}
|
|
|
| - MOCK_METHOD2(DoDrawQuad, void(DrawingFrame* frame, const DrawQuad* quad));
|
| + MOCK_METHOD3(DoDrawQuad,
|
| + void(DrawingFrame* frame,
|
| + const DrawQuad* quad,
|
| + const gfx::QuadF* draw_region));
|
|
|
| using GLRenderer::BeginDrawingFrame;
|
|
|
| @@ -875,7 +878,7 @@ TEST_F(GLRendererWithOverlaysTest, OverlayQuadNotDrawn) {
|
|
|
| // Candidate pass was taken out and extra skipped pass added,
|
| // so only draw 2 quads.
|
| - EXPECT_CALL(*renderer_, DoDrawQuad(_, _)).Times(2);
|
| + EXPECT_CALL(*renderer_, DoDrawQuad(_, _, _)).Times(2);
|
| EXPECT_CALL(scheduler_,
|
| Schedule(1,
|
| gfx::OVERLAY_TRANSFORM_NONE,
|
| @@ -913,7 +916,7 @@ TEST_F(GLRendererWithOverlaysTest, OccludedQuadDrawn) {
|
| pass_list.push_back(pass.Pass());
|
|
|
| // 3 quads in the pass, all should draw.
|
| - EXPECT_CALL(*renderer_, DoDrawQuad(_, _)).Times(3);
|
| + EXPECT_CALL(*renderer_, DoDrawQuad(_, _, _)).Times(3);
|
| EXPECT_CALL(scheduler_, Schedule(_, _, _, _, _)).Times(0);
|
| renderer_->DrawFrame(&pass_list, 1.f, viewport_rect, viewport_rect, false);
|
|
|
| @@ -946,7 +949,7 @@ TEST_F(GLRendererWithOverlaysTest, NoValidatorNoOverlay) {
|
| pass_list.push_back(pass.Pass());
|
|
|
| // Should see no overlays.
|
| - EXPECT_CALL(*renderer_, DoDrawQuad(_, _)).Times(3);
|
| + EXPECT_CALL(*renderer_, DoDrawQuad(_, _, _)).Times(3);
|
| EXPECT_CALL(scheduler_, Schedule(_, _, _, _, _)).Times(0);
|
| renderer_->DrawFrame(&pass_list, 1.f, viewport_rect, viewport_rect, false);
|
|
|
|
|