Revert of Optimize GLES2DecoderImpl::ApplyDirtyState.

gpu/command_buffer/service/context_state.h

Index: gpu/command_buffer/service/context_state.h
diff --git a/gpu/command_buffer/service/context_state.h b/gpu/command_buffer/service/context_state.h
index e436e74e280a4a65636beefc1989feadc4d67ee4..83818e9b0511a4cbed1666a0d80ba1534e551e65 100644
--- a/gpu/command_buffer/service/context_state.h
+++ b/gpu/command_buffer/service/context_state.h
@@ -101,10 +101,6 @@
 
   void Initialize();
 
-  void SetIgnoreCachedStateForTest(bool ignore) {
-    ignore_cached_state = ignore;
-  }
-
   void RestoreState(const ContextState* prev_state) const;
   void InitCapabilities(const ContextState* prev_state) const;
   void InitState(const ContextState* prev_state) const;
@@ -129,44 +125,6 @@
   bool GetStateAsGLfloat(
       GLenum pname, GLfloat* params, GLsizei* num_written) const;
   bool GetEnabled(GLenum cap) const;
-
-  inline void SetDeviceColorMask(GLboolean red,
-                                 GLboolean green,
-                                 GLboolean blue,
-                                 GLboolean alpha) {
-    if (cached_color_mask_red == red && cached_color_mask_green == green &&
-        cached_color_mask_blue == blue && cached_color_mask_alpha == alpha &&
-        !ignore_cached_state)
-      return;
-    cached_color_mask_red = red;
-    cached_color_mask_green = green;
-    cached_color_mask_blue = blue;
-    cached_color_mask_alpha = alpha;
-    glColorMask(red, green, blue, alpha);
-  }
-
-  inline void SetDeviceDepthMask(GLboolean mask) {
-    if (cached_depth_mask == mask && !ignore_cached_state)
-      return;
-    cached_depth_mask = mask;
-    glDepthMask(mask);
-  }
-
-  inline void SetDeviceStencilMaskSeparate(GLenum op, GLuint mask) {
-    if (op == GL_FRONT) {
-      if (cached_stencil_front_writemask == mask && !ignore_cached_state)
-        return;
-      cached_stencil_front_writemask = mask;
-    } else if (op == GL_BACK) {
-      if (cached_stencil_back_writemask == mask && !ignore_cached_state)
-        return;
-      cached_stencil_back_writemask = mask;
-    } else {
-      NOTREACHED();
-      return;
-    }
-    glStencilMaskSeparate(op, mask);
-  }
 
   ErrorState* GetErrorState();
 
@@ -204,7 +162,6 @@
   QueryMap current_queries;
 
   bool pack_reverse_row_order;
-  bool ignore_cached_state;
 
   mutable bool fbo_binding_for_scissor_workaround_dirty_;
   FeatureInfo* feature_info_;