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

gpu/command_buffer/service/buffer_manager.h

 // 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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_BUFFER_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_BUFFER_MANAGER_H_
 
 #include <map>
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/command_buffer/service/memory_tracking.h"
 #include "gpu/gpu_export.h"
 
 namespace gpu {
 namespace gles2 {
 
 class BufferManager;
+class ErrorState;
 class FeatureInfo;
-class GLES2Decoder;
 
 // Info about Buffers currently in the system.
 class GPU_EXPORT Buffer : public base::RefCounted<Buffer> {
  public:
   Buffer(BufferManager* manager, GLuint service_id);
 
   GLuint service_id() const {
     return service_id_;
   }
 
@@ skipping 153 matching lines @@
 
   // Removes a buffer info for the given buffer.
   void RemoveBuffer(GLuint client_id);
 
   // Gets a client id for a given service id.
   bool GetClientId(GLuint service_id, GLuint* client_id) const;
 
   // Does a glBufferData and updates the approprate accounting. Currently
   // assume the values have already been validated.
   void DoBufferData(
-      GLES2Decoder* decoder,
+      ErrorState* error_state,
       Buffer* buffer,
       GLsizeiptr size,
       GLenum usage,
       const GLvoid* data);
 
   // Does a glBufferSubData and updates the approrate accounting.
   void DoBufferSubData(
-      GLES2Decoder* decoder,
+      ErrorState* error_state,
       Buffer* buffer,
       GLintptr offset,
       GLsizeiptr size,
       const GLvoid* data);
 
   // Sets the target of a buffer. Returns false if the target can not be set.
   bool SetTarget(Buffer* buffer, GLenum target);
 
   void set_allow_buffers_on_multiple_targets(bool allow) {
     allow_buffers_on_multiple_targets_ = allow;
@@ skipping 33 matching lines @@
   bool have_context_;
   bool use_client_side_arrays_for_stream_buffers_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_BUFFER_MANAGER_H_