Merged in recent changes to command buffer code.

gpu/command_buffer/service/gles2_cmd_decoder.h

 // Copyright (c) 2006-2009 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.
 
 // This file contains the GLES2Decoder class.
 
 #ifndef O3D_COMMAND_BUFFER_SERVICE_CROSS_GLES2_CMD_DECODER_H
 #define O3D_COMMAND_BUFFER_SERVICE_CROSS_GLES2_CMD_DECODER_H
 
 #include <build/build_config.h>
@@ skipping 10 matching lines @@
 class GLES2Decoder : public CommonDecoder {
  public:
   typedef parse_error::ParseError ParseError;
 
   // Creates a decoder.
   static GLES2Decoder* Create();
 
   virtual ~GLES2Decoder() {
   }
 
+  bool debug() const {
+    return debug_;
+  }
+
+  void set_debug(bool debug) {
+    debug_ = debug;
+  }
+
 #if defined(OS_LINUX)
   void set_window_wrapper(XWindowWrapper *window) {
     window_ = window;
   }
   XWindowWrapper* window() const {
     return window_;
   }
 #elif defined(OS_WIN)
   void set_hwnd(HWND hwnd) {
     hwnd_ = hwnd;
   }
 
   HWND hwnd() const {
     return hwnd_;
   }
 #endif
 
   // Initializes the graphics context.
   // Returns:
   //   true if successful.
   virtual bool Initialize() = 0;
 
   // Destroys the graphics context.
   virtual void Destroy() = 0;
 
  protected:
   GLES2Decoder();
 
  private:
+  bool debug_;
+
 #if defined(OS_LINUX)
   XWindowWrapper *window_;
 #elif defined(OS_WIN)
   // Handle to the GL device.
   HWND hwnd_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(GLES2Decoder);
 };
 
 }  // namespace gles2
 }  // namespace command_buffer
 
 #endif  // O3D_COMMAND_BUFFER_SERVICE_CROSS_GLES2_CMD_DECODER_H