Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3420)

Unified Diff: cc/output/gl_renderer_unittest.cc

Issue 2693023002: Use SwapBuffersWithBounds on Chromecast (Closed)
Patch Set: danakj nits Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/output/gl_renderer.cc ('k') | cc/output/output_surface_frame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/gl_renderer_unittest.cc
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
index 477d67f2efa97cee325b395cee66475ab951b197..817a6c01e536e46908a3e46f382c2ddc4976ae67 100644
--- a/cc/output/gl_renderer_unittest.cc
+++ b/cc/output/gl_renderer_unittest.cc
@@ -1625,10 +1625,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 {
@@ -1725,7 +1726,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_);
@@ -1746,7 +1747,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
@@ -1765,7 +1766,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);
}
« no previous file with comments | « cc/output/gl_renderer.cc ('k') | cc/output/output_surface_frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698