Index: cc/output/gl_renderer_unittest.cc |
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc |
index 57ec9845655ddb772d4f9cacd34cb0b9a0acc8e7..0723e3a80f2499eb5513b2b21fe793af70b071d8 100644 |
--- a/cc/output/gl_renderer_unittest.cc |
+++ b/cc/output/gl_renderer_unittest.cc |
@@ -340,7 +340,6 @@ TEST_F(GLRendererWithDefaultHarnessTest, |
renderer_->SetVisible(true); |
renderer_->DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
viewport_rect, |
@@ -365,7 +364,6 @@ TEST_F(GLRendererWithDefaultHarnessTest, |
char pixels[4]; |
renderer_->DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
viewport_rect, |
@@ -390,7 +388,6 @@ TEST_F(GLRendererWithDefaultHarnessTest, ExternalStencil) { |
root_pass->has_transparent_background = false; |
renderer_->DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
viewport_rect, |
@@ -620,7 +617,6 @@ TEST_F(GLRendererTest, OpaqueBackground) { |
EXPECT_CALL(*context, clear(_)).Times(1); |
#endif |
renderer.DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
viewport_rect, |
@@ -659,7 +655,6 @@ TEST_F(GLRendererTest, TransparentBackground) { |
EXPECT_CALL(*context, discardFramebufferEXT(GL_FRAMEBUFFER, 1, _)).Times(1); |
EXPECT_CALL(*context, clear(_)).Times(1); |
renderer.DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
viewport_rect, |
@@ -700,7 +695,6 @@ TEST_F(GLRendererTest, OffscreenOutputSurface) { |
.Times(1); |
EXPECT_CALL(*context, clear(_)).Times(AnyNumber()); |
renderer.DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
viewport_rect, |
@@ -784,7 +778,6 @@ TEST_F(GLRendererTest, VisibilityChangeIsLastCall) { |
// the stack. |
renderer.SetVisible(true); |
renderer.DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
viewport_rect, |
@@ -879,7 +872,6 @@ TEST_F(GLRendererTest, ActiveTextureState) { |
gfx::Rect viewport_rect(100, 100); |
renderer.DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
viewport_rect, |
@@ -957,7 +949,6 @@ TEST_F(GLRendererTest, ShouldClearRootRenderPass) { |
renderer.DecideRenderPassAllocationsForFrame(render_passes_in_draw_order_); |
renderer.DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
viewport_rect, |
@@ -1041,7 +1032,6 @@ TEST_F(GLRendererTest, ScissorTestWhenClearing) { |
renderer.DecideRenderPassAllocationsForFrame(render_passes_in_draw_order_); |
renderer.DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
viewport_rect, |
@@ -1120,7 +1110,6 @@ TEST_F(GLRendererTest, NoDiscardOnPartialUpdates) { |
renderer.DecideRenderPassAllocationsForFrame(render_passes_in_draw_order_); |
renderer.DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
clip_rect, |
@@ -1140,7 +1129,6 @@ TEST_F(GLRendererTest, NoDiscardOnPartialUpdates) { |
renderer.DecideRenderPassAllocationsForFrame(render_passes_in_draw_order_); |
renderer.DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
clip_rect, |
@@ -1162,7 +1150,6 @@ TEST_F(GLRendererTest, NoDiscardOnPartialUpdates) { |
renderer.DecideRenderPassAllocationsForFrame(render_passes_in_draw_order_); |
renderer.DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
clip_rect, |
@@ -1184,7 +1171,6 @@ TEST_F(GLRendererTest, NoDiscardOnPartialUpdates) { |
renderer.DecideRenderPassAllocationsForFrame(render_passes_in_draw_order_); |
renderer.DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
clip_rect, |
@@ -1205,7 +1191,6 @@ TEST_F(GLRendererTest, NoDiscardOnPartialUpdates) { |
renderer.DecideRenderPassAllocationsForFrame(render_passes_in_draw_order_); |
renderer.DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
clip_rect, |
@@ -1227,7 +1212,6 @@ TEST_F(GLRendererTest, NoDiscardOnPartialUpdates) { |
renderer.DecideRenderPassAllocationsForFrame(render_passes_in_draw_order_); |
renderer.DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
clip_rect, |
@@ -1308,7 +1292,6 @@ TEST_F(GLRendererTest, ScissorAndViewportWithinNonreshapableSurface) { |
renderer.DecideRenderPassAllocationsForFrame(render_passes_in_draw_order_); |
renderer.DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
device_viewport_rect, |
device_viewport_rect, |
@@ -1374,7 +1357,6 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) { |
renderer_->DecideRenderPassAllocationsForFrame(render_passes_in_draw_order_); |
renderer_->DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
viewport_rect, |
@@ -1398,7 +1380,6 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) { |
renderer_->DecideRenderPassAllocationsForFrame(render_passes_in_draw_order_); |
renderer_->DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
viewport_rect, |
@@ -1423,7 +1404,6 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) { |
renderer_->DecideRenderPassAllocationsForFrame(render_passes_in_draw_order_); |
renderer_->DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
viewport_rect, |
@@ -1447,7 +1427,6 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) { |
renderer_->DecideRenderPassAllocationsForFrame(render_passes_in_draw_order_); |
renderer_->DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
viewport_rect, |
@@ -1472,7 +1451,6 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) { |
renderer_->DecideRenderPassAllocationsForFrame(render_passes_in_draw_order_); |
renderer_->DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
viewport_rect, |
@@ -1496,7 +1474,6 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) { |
renderer_->DecideRenderPassAllocationsForFrame(render_passes_in_draw_order_); |
renderer_->DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
viewport_rect, |
@@ -1521,7 +1498,6 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) { |
renderer_->DecideRenderPassAllocationsForFrame(render_passes_in_draw_order_); |
renderer_->DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
viewport_rect, |
@@ -1545,7 +1521,6 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) { |
renderer_->DecideRenderPassAllocationsForFrame(render_passes_in_draw_order_); |
renderer_->DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
viewport_rect, |
@@ -1590,7 +1565,6 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadSkipsAAForClippingTransform) { |
renderer_->DecideRenderPassAllocationsForFrame(render_passes_in_draw_order_); |
renderer_->DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
viewport_rect, |
@@ -1621,7 +1595,6 @@ TEST_F(GLRendererShaderTest, DrawSolidColorShader) { |
renderer_->DecideRenderPassAllocationsForFrame(render_passes_in_draw_order_); |
renderer_->DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
1.f, |
viewport_rect, |
viewport_rect, |
@@ -1703,7 +1676,6 @@ class MockOutputSurfaceTest : public GLRendererTest { |
renderer_->DecideRenderPassAllocationsForFrame( |
render_passes_in_draw_order_); |
renderer_->DrawFrame(&render_passes_in_draw_order_, |
- NULL, |
device_scale_factor, |
device_viewport_rect, |
device_viewport_rect, |