gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc - Issue 10078006: Revert 132934 - this change seems to break many webgl related layout tests

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc

Issue 10078006: Revert 132934 - this change seems to break many webgl related layout tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 8 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 | « gpu/command_buffer/service/gles2_cmd_decoder_autogen.h ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc

===================================================================

--- gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc (revision 132957)

+++ gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc (working copy)

@@ -3525,9 +3525,7 @@

false, // depth enabled

0, // front stencil mask

0, // back stencil mask

- false, // stencil enabled

- false, // cull_face_enabled

- false); // scissor_test_enabled

+ false); // stencil enabled

EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))

.Times(1)

@@ -3581,9 +3579,7 @@

false, // depth enabled

0, // front stencil mask

0, // back stencil mask

- false, // stencil enabled

- false, // cull_face_enabled

- false); // scissor_test_enabled

+ false); // stencil enabled

EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))

.Times(1)

@@ -3635,10 +3631,7 @@

false, // depth enabled

0, // front stencil mask

0, // back stencil mask

- false, // stencil enabled

- false, // cull_face_enabled

- false); // scissor_test_enabled

+ false); // stencil enabled

EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))

.Times(1)

.RetiresOnSaturation();

@@ -3690,9 +3683,7 @@

false, // depth enabled

0, // front stencil mask

0, // back stencil mask

- false, // stencil enabled

- false, // cull_face_enabled

- false); // scissor_test_enabled

+ false); // stencil enabled

EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))

.Times(1)

@@ -3738,10 +3729,7 @@

false, // depth enabled

0, // front stencil mask

0, // back stencil mask

- false, // stencil enabled

- false, // cull_face_enabled

- false); // scissor_test_enabled

+ false); // stencil enabled

EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))

.Times(1)

.RetiresOnSaturation();

@@ -3767,9 +3755,7 @@

false, // depth enabled

0, // front stencil mask

0, // back stencil mask

- false, // stencil enabled

- false, // cull_face_enabled

- false); // scissor_test_enabled

+ false); // stencil enabled

EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))

.Times(1)

@@ -3992,10 +3978,7 @@

true, // depth enabled

0, // front stencil mask

0, // back stencil mask

- false, // stencil enabled

- false, // cull_face_enabled

- false); // scissor_test_enabled

+ false); // stencil enabled

EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))

.Times(1)

.RetiresOnSaturation();

@@ -4052,10 +4035,7 @@

false, // depth enabled

0, // front stencil mask

0, // back stencil mask

- false, // stencil enabled

- false, // cull_face_enabled

- false); // scissor_test_enabled

+ false); // stencil enabled

EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))

.Times(1)

.RetiresOnSaturation();

@@ -4112,10 +4092,7 @@

false, // depth enabled

-1, // front stencil mask

-1, // back stencil mask

- true, // stencil enabled

- false, // cull_face_enabled

- false); // scissor_test_enabled

+ true); // stencil enabled

EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))

.Times(1)

.RetiresOnSaturation();

@@ -4172,10 +4149,7 @@

false, // depth enabled

0, // front stencil mask

0, // back stencil mask

- false, // stencil enabled

- false, // cull_face_enabled

- false); // scissor_test_enabled

+ false); // stencil enabled

EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))

.Times(1)

.RetiresOnSaturation();

@@ -5927,10 +5901,7 @@

false, // depth enabled

0, // front stencil mask

0, // back stencil mask

- false, // stencil enabled

- false, // cull_face_enabled

- false); // scissor_test_enabled

+ false); // stencil enabled

EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))

.Times(1)

.RetiresOnSaturation();

@@ -6092,10 +6063,7 @@

false, // depth enabled

0, // front stencil mask

0, // back stencil mask

- false, // stencil enabled

- false, // cull_face_enabled

- false); // scissor_test_enabled

+ false); // stencil enabled

EXPECT_CALL(*gl_, Clear(GL_COLOR_BUFFER_BIT))

.Times(1)

.RetiresOnSaturation();

@@ -6248,10 +6216,7 @@

false, // depth enabled

0, // front stencil mask

0, // back stencil mask

- false, // stencil enabled

- false, // cull_face_enabled

- false); // scissor_test_enabled

+ false); // stencil enabled

EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))

.Times(1)

.RetiresOnSaturation();

@@ -6363,10 +6328,7 @@

false, // depth enabled

0, // front stencil mask

0, // back stencil mask

- false, // stencil enabled

- false, // cull_face_enabled

- false); // scissor_test_enabled

+ false); // stencil enabled

EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))

.Times(1)

.RetiresOnSaturation();

@@ -6583,10 +6545,7 @@

false, // depth enabled

0, // front stencil mask

0, // back stencil mask

- false, // stencil enabled

- false, // cull_face_enabled

- false); // scissor_test_enabled

+ false); // stencil enabled

EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))

.Times(1)

.RetiresOnSaturation();