| Index: cc/output/gl_renderer_unittest.cc
|
| diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
|
| index c468399941aeae81d21f73644a4b3a3bd0dd16d0..918e01ec28ab2db2db4441d2251b7f3e3d38d627 100644
|
| --- a/cc/output/gl_renderer_unittest.cc
|
| +++ b/cc/output/gl_renderer_unittest.cc
|
| @@ -1590,10 +1590,11 @@ class TestOverlayProcessor : public OverlayProcessor {
|
| public:
|
| Strategy() {}
|
| ~Strategy() override {}
|
| - MOCK_METHOD3(Attempt,
|
| + MOCK_METHOD4(Attempt,
|
| bool(ResourceProvider* resource_provider,
|
| RenderPass* render_pass,
|
| - OverlayCandidateList* candidates));
|
| + OverlayCandidateList* candidates,
|
| + std::vector<gfx::Rect>* content_bounds));
|
| };
|
|
|
| class Validator : public OverlayCandidateValidator {
|
| @@ -1690,7 +1691,7 @@ TEST_F(GLRendererTest, DontOverlayWithCopyRequests) {
|
| // added a fake strategy, so checking for Attempt calls checks if there was
|
| // any attempt to overlay, which there shouldn't be. We can't use the quad
|
| // list because the render pass is cleaned up by DrawFrame.
|
| - EXPECT_CALL(*processor->strategy_, Attempt(_, _, _)).Times(0);
|
| + EXPECT_CALL(*processor->strategy_, Attempt(_, _, _, _)).Times(0);
|
| EXPECT_CALL(*validator, AllowCALayerOverlays()).Times(0);
|
| DrawFrame(&renderer, viewport_size);
|
| Mock::VerifyAndClearExpectations(processor->strategy_);
|
| @@ -1711,7 +1712,7 @@ TEST_F(GLRendererTest, DontOverlayWithCopyRequests) {
|
| EXPECT_CALL(*validator, AllowCALayerOverlays())
|
| .Times(1)
|
| .WillOnce(::testing::Return(false));
|
| - EXPECT_CALL(*processor->strategy_, Attempt(_, _, _)).Times(1);
|
| + EXPECT_CALL(*processor->strategy_, Attempt(_, _, _, _)).Times(1);
|
| DrawFrame(&renderer, viewport_size);
|
|
|
| // If the CALayerOverlay path is taken, then the ordinary overlay path should
|
| @@ -1730,7 +1731,7 @@ TEST_F(GLRendererTest, DontOverlayWithCopyRequests) {
|
| EXPECT_CALL(*validator, AllowCALayerOverlays())
|
| .Times(1)
|
| .WillOnce(::testing::Return(true));
|
| - EXPECT_CALL(*processor->strategy_, Attempt(_, _, _)).Times(0);
|
| + EXPECT_CALL(*processor->strategy_, Attempt(_, _, _, _)).Times(0);
|
| DrawFrame(&renderer, viewport_size);
|
| }
|
|
|
|
|