| Index: cc/output/overlay_unittest.cc
|
| diff --git a/cc/output/overlay_unittest.cc b/cc/output/overlay_unittest.cc
|
| index edecacf9ff51c955cc9e4461b70633dfba136c7b..8b7dc2a8027663d363b1b280d0d0102e57976df9 100644
|
| --- a/cc/output/overlay_unittest.cc
|
| +++ b/cc/output/overlay_unittest.cc
|
| @@ -537,10 +537,6 @@
|
|
|
| MOCK_METHOD2(DoDrawQuad, void(DrawingFrame* frame, const DrawQuad* quad));
|
|
|
| - virtual void BeginDrawingFrame(DrawingFrame* frame) override {
|
| - GLRenderer::BeginDrawingFrame(frame);
|
| - }
|
| -
|
| virtual void FinishDrawingFrame(DrawingFrame* frame) override {
|
| GLRenderer::FinishDrawingFrame(frame);
|
|
|
| @@ -741,7 +737,6 @@
|
| overlay2.plane_z_order = 1;
|
|
|
| EXPECT_CALL(scheduler_, Schedule(_, _, _, _, _)).Times(1);
|
| - renderer_->BeginDrawingFrame(&frame1);
|
| renderer_->FinishDrawingFrame(&frame1);
|
| EXPECT_TRUE(resource_provider_->InUseByConsumer(resource1));
|
| EXPECT_FALSE(resource_provider_->InUseByConsumer(resource2));
|
| @@ -749,7 +744,6 @@
|
| Mock::VerifyAndClearExpectations(&scheduler_);
|
|
|
| EXPECT_CALL(scheduler_, Schedule(_, _, _, _, _)).Times(1);
|
| - renderer_->BeginDrawingFrame(&frame2);
|
| renderer_->FinishDrawingFrame(&frame2);
|
| EXPECT_TRUE(resource_provider_->InUseByConsumer(resource1));
|
| EXPECT_TRUE(resource_provider_->InUseByConsumer(resource2));
|
| @@ -758,7 +752,6 @@
|
| Mock::VerifyAndClearExpectations(&scheduler_);
|
|
|
| EXPECT_CALL(scheduler_, Schedule(_, _, _, _, _)).Times(1);
|
| - renderer_->BeginDrawingFrame(&frame1);
|
| renderer_->FinishDrawingFrame(&frame1);
|
| EXPECT_TRUE(resource_provider_->InUseByConsumer(resource1));
|
| EXPECT_TRUE(resource_provider_->InUseByConsumer(resource2));
|
| @@ -770,7 +763,6 @@
|
| EXPECT_CALL(scheduler_, Schedule(_, _, _, _, _)).Times(0);
|
| DirectRenderer::DrawingFrame frame3;
|
| renderer_->set_expect_overlays(false);
|
| - renderer_->BeginDrawingFrame(&frame3);
|
| renderer_->FinishDrawingFrame(&frame3);
|
| EXPECT_TRUE(resource_provider_->InUseByConsumer(resource1));
|
| EXPECT_FALSE(resource_provider_->InUseByConsumer(resource2));
|
| @@ -781,14 +773,12 @@
|
| // Use the same buffer twice.
|
| renderer_->set_expect_overlays(true);
|
| EXPECT_CALL(scheduler_, Schedule(_, _, _, _, _)).Times(1);
|
| - renderer_->BeginDrawingFrame(&frame1);
|
| renderer_->FinishDrawingFrame(&frame1);
|
| EXPECT_TRUE(resource_provider_->InUseByConsumer(resource1));
|
| SwapBuffers();
|
| Mock::VerifyAndClearExpectations(&scheduler_);
|
|
|
| EXPECT_CALL(scheduler_, Schedule(_, _, _, _, _)).Times(1);
|
| - renderer_->BeginDrawingFrame(&frame1);
|
| renderer_->FinishDrawingFrame(&frame1);
|
| EXPECT_TRUE(resource_provider_->InUseByConsumer(resource1));
|
| SwapBuffers();
|
| @@ -797,7 +787,6 @@
|
|
|
| EXPECT_CALL(scheduler_, Schedule(_, _, _, _, _)).Times(0);
|
| renderer_->set_expect_overlays(false);
|
| - renderer_->BeginDrawingFrame(&frame3);
|
| renderer_->FinishDrawingFrame(&frame3);
|
| EXPECT_TRUE(resource_provider_->InUseByConsumer(resource1));
|
| SwapBuffers();
|
|
|