Fix desynched GPU stencil mask cache values.

gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 709 matching lines @@
   }
 }
 
 void GLES2DecoderTestBase::SetupExpectationsForDepthMask(bool mask) {
   if (ignore_cached_state_for_test_ || cached_depth_mask_ != mask) {
     cached_depth_mask_ = mask;
     EXPECT_CALL(*gl_, DepthMask(mask)).Times(1).RetiresOnSaturation();
   }
 }
 
+void GLES2DecoderTestBase::SetupExpectationsForStencilMask(uint32 front_mask,
+                                                           uint32 back_mask) {
+    if (ignore_cached_state_for_test_ ||

[Zhenyao Mo, 2014/06/02 20:33:53]

indent is 2 instead of 4

+        cached_stencil_front_mask_ != front_mask) {
+        cached_stencil_front_mask_ = front_mask;
+        EXPECT_CALL(*gl_, StencilMaskSeparate(GL_FRONT, front_mask))
+            .Times(1)
+            .RetiresOnSaturation();
+    }
+
+    if (ignore_cached_state_for_test_ ||
+        cached_stencil_back_mask_ != back_mask) {
+        cached_stencil_back_mask_ = back_mask;
+        EXPECT_CALL(*gl_, StencilMaskSeparate(GL_BACK, back_mask))
+            .Times(1)
+            .RetiresOnSaturation();
+    }
+}
+
 void GLES2DecoderTestBase::SetupExpectationsForEnableDisable(GLenum cap,
                                                              bool enable) {
   switch (cap) {
     case GL_BLEND:
       if (enable_flags_.cached_blend == enable &&
           !ignore_cached_state_for_test_)
         return;
       enable_flags_.cached_blend = enable;
       break;
     case GL_CULL_FACE:
@@ skipping 66 matching lines @@
     GLuint back_stencil_mask,
     bool stencil_enabled) {
   bool color_mask_red = (color_bits & 0x1000) != 0;
   bool color_mask_green = (color_bits & 0x0100) != 0;
   bool color_mask_blue = (color_bits & 0x0010) != 0;
   bool color_mask_alpha = (color_bits & 0x0001) && !framebuffer_is_rgb;
 
   SetupExpectationsForColorMask(
       color_mask_red, color_mask_green, color_mask_blue, color_mask_alpha);
   SetupExpectationsForDepthMask(depth_mask);
-
-  if (ignore_cached_state_for_test_ ||
-      cached_stencil_front_mask_ != front_stencil_mask) {
-    cached_stencil_front_mask_ = front_stencil_mask;
-    EXPECT_CALL(*gl_, StencilMaskSeparate(GL_FRONT, front_stencil_mask))
-        .Times(1)
-        .RetiresOnSaturation();
-  }
-
-  if (ignore_cached_state_for_test_ ||
-      cached_stencil_back_mask_ != back_stencil_mask) {
-    cached_stencil_back_mask_ = back_stencil_mask;
-    EXPECT_CALL(*gl_, StencilMaskSeparate(GL_BACK, back_stencil_mask))
-        .Times(1)
-        .RetiresOnSaturation();
-  }
-
+  SetupExpectationsForStencilMask(front_stencil_mask, back_stencil_mask);
   SetupExpectationsForEnableDisable(GL_DEPTH_TEST,
                                     framebuffer_has_depth && depth_enabled);
   SetupExpectationsForEnableDisable(GL_STENCIL_TEST,
                                     framebuffer_has_stencil && stencil_enabled);
 }
 
 void GLES2DecoderTestBase::SetupExpectationsForApplyingDefaultDirtyState() {
   SetupExpectationsForApplyingDirtyState(false,   // Framebuffer is RGB
                                          false,   // Framebuffer has depth
                                          false,   // Framebuffer has stencil
@@ skipping 768 matching lines @@
   SetupDefaultProgram();
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu