| Index: cc/output/gl_renderer_unittest.cc
|
| diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
|
| index d6f7522a5f64ee084da6fae7e4bcbeac060ae2a2..1533986eccc03b8ec001304d63b9726df80b933b 100644
|
| --- a/cc/output/gl_renderer_unittest.cc
|
| +++ b/cc/output/gl_renderer_unittest.cc
|
| @@ -159,8 +159,7 @@ class GLRendererWithDefaultHarnessTest : public GLRendererTest {
|
| NULL,
|
| 0,
|
| false,
|
| - 1,
|
| - false).Pass();
|
| + 1).Pass();
|
| renderer_ = make_scoped_ptr(new FakeRendererGL(&renderer_client_,
|
| &settings_,
|
| output_surface_.get(),
|
| @@ -196,8 +195,7 @@ class GLRendererShaderTest : public GLRendererTest {
|
| NULL,
|
| 0,
|
| false,
|
| - 1,
|
| - false).Pass();
|
| + 1).Pass();
|
| renderer_.reset(new FakeRendererGL(&renderer_client_,
|
| &settings_,
|
| output_surface_.get(),
|
| @@ -490,8 +488,7 @@ TEST_F(GLRendererTest, InitializationDoesNotMakeSynchronousCalls) {
|
| NULL,
|
| 0,
|
| false,
|
| - 1,
|
| - false));
|
| + 1));
|
|
|
| LayerTreeSettings settings;
|
| FakeRendererClient renderer_client;
|
| @@ -533,8 +530,7 @@ TEST_F(GLRendererTest, InitializationWithQuicklyLostContextDoesNotAssert) {
|
| NULL,
|
| 0,
|
| false,
|
| - 1,
|
| - false));
|
| + 1));
|
|
|
| LayerTreeSettings settings;
|
| FakeRendererClient renderer_client;
|
| @@ -573,8 +569,7 @@ TEST_F(GLRendererTest, OpaqueBackground) {
|
| NULL,
|
| 0,
|
| false,
|
| - 1,
|
| - false));
|
| + 1));
|
|
|
| LayerTreeSettings settings;
|
| FakeRendererClient renderer_client;
|
| @@ -626,8 +621,7 @@ TEST_F(GLRendererTest, TransparentBackground) {
|
| NULL,
|
| 0,
|
| false,
|
| - 1,
|
| - false));
|
| + 1));
|
|
|
| LayerTreeSettings settings;
|
| FakeRendererClient renderer_client;
|
| @@ -672,8 +666,7 @@ TEST_F(GLRendererTest, OffscreenOutputSurface) {
|
| NULL,
|
| 0,
|
| false,
|
| - 1,
|
| - false));
|
| + 1));
|
|
|
| LayerTreeSettings settings;
|
| FakeRendererClient renderer_client;
|
| @@ -760,8 +753,7 @@ TEST_F(GLRendererTest, VisibilityChangeIsLastCall) {
|
| NULL,
|
| 0,
|
| false,
|
| - 1,
|
| - false));
|
| + 1));
|
|
|
| LayerTreeSettings settings;
|
| FakeRendererClient renderer_client;
|
| @@ -832,8 +824,7 @@ TEST_F(GLRendererTest, ActiveTextureState) {
|
| NULL,
|
| 0,
|
| false,
|
| - 1,
|
| - false));
|
| + 1));
|
|
|
| LayerTreeSettings settings;
|
| FakeRendererClient renderer_client;
|
| @@ -924,8 +915,7 @@ TEST_F(GLRendererTest, ShouldClearRootRenderPass) {
|
| NULL,
|
| 0,
|
| false,
|
| - 1,
|
| - false));
|
| + 1));
|
|
|
| LayerTreeSettings settings;
|
| settings.should_clear_root_render_pass = false;
|
| @@ -1023,8 +1013,7 @@ TEST_F(GLRendererTest, ScissorTestWhenClearing) {
|
| NULL,
|
| 0,
|
| false,
|
| - 1,
|
| - false));
|
| + 1));
|
|
|
| LayerTreeSettings settings;
|
| FakeRendererClient renderer_client;
|
| @@ -1122,8 +1111,7 @@ TEST_F(GLRendererTest, NoDiscardOnPartialUpdates) {
|
| NULL,
|
| 0,
|
| false,
|
| - 1,
|
| - false));
|
| + 1));
|
|
|
| LayerTreeSettings settings;
|
| settings.partial_swap_enabled = true;
|
| @@ -1314,8 +1302,7 @@ TEST_F(GLRendererTest, ScissorAndViewportWithinNonreshapableSurface) {
|
| NULL,
|
| 0,
|
| false,
|
| - 1,
|
| - false));
|
| + 1));
|
|
|
| LayerTreeSettings settings;
|
| FakeRendererClient renderer_client;
|
| @@ -1694,8 +1681,7 @@ class MockOutputSurfaceTest : public GLRendererTest {
|
| NULL,
|
| 0,
|
| false,
|
| - 1,
|
| - false).Pass();
|
| + 1).Pass();
|
|
|
| renderer_.reset(new FakeRendererGL(&renderer_client_,
|
| &settings_,
|
|
|