Clean up of GLES2 Command Decoder by moving some of the error state into a separate class.

gpu/command_buffer/service/context_state.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/context_state.h"
 
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/buffer_manager.h"
+#include "gpu/command_buffer/service/error_state.h"
 #include "gpu/command_buffer/service/framebuffer_manager.h"
 #include "gpu/command_buffer/service/program_manager.h"
 #include "gpu/command_buffer/service/renderbuffer_manager.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_implementation.h"
 
 namespace gpu {
 namespace gles2 {
 
 namespace {
 
 void EnableDisable(GLenum pname, bool enable) {
   if (enable) {
     glEnable(pname);
   } else {
     glDisable(pname);
   }
 }
 
 }  // anonymous namespace.
 
 TextureUnit::TextureUnit()
     : bind_target(GL_TEXTURE_2D) {
 }
 
 TextureUnit::~TextureUnit() {
 }
 
-ContextState::ContextState(FeatureInfo* feature_info)
+ContextState::ContextState(FeatureInfo* feature_info, Logger* logger)
     : pack_alignment(4),
       unpack_alignment(4),
       active_texture_unit(0),
       hint_generate_mipmap(GL_DONT_CARE),
       hint_fragment_shader_derivative(GL_DONT_CARE),
       pack_reverse_row_order(false),
       fbo_binding_for_scissor_workaround_dirty_(false),
-      feature_info_(feature_info) {
+      feature_info_(feature_info),
+      error_state_(ErrorState::Create(logger)) {
   Initialize();
 }
 
 ContextState::~ContextState() {
 }
 
 void ContextState::RestoreTextureUnitBindings(GLuint unit) const {
   DCHECK_LT(unit, texture_units.size());
   const TextureUnit& texture_unit = texture_units[unit];
   glActiveTexture(GL_TEXTURE0 + unit);
@@ skipping 98 matching lines @@
       RestoreAttribute(attrib);
     }
   }
 
   RestoreBufferBindings();
   RestoreRenderbufferBindings();
   RestoreProgramBindings();
   RestoreGlobalState();
 }
 
+ErrorState* ContextState::GetErrorState() {
+  return error_state_.get();
+}
+
 // 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/context_state_impl_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu