Virtual GL

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 6997d601a049efc87456e7f82312c42b461e217b..b011ab2b2a445afee26039298fa3dfb64e42ff85 100644
--- a/gpu/command_buffer/service/context_state.h
+++ b/gpu/command_buffer/service/context_state.h
@@ -7,6 +7,7 @@
 #ifndef GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_
 #define GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_
 
+#include <vector>
 #include "base/logging.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/command_buffer/service/buffer_manager.h"
@@ -83,8 +84,9 @@ struct GPU_EXPORT ContextState {
 
   void Initialize();
 
-  void InitCapabilities();
-  void InitState();
+  void RestoreState() const;
+  void InitCapabilities() const;
+  void InitState() const;
 
   #include "gpu/command_buffer/service/context_state_autogen.h"
 
@@ -101,16 +103,12 @@ struct GPU_EXPORT ContextState {
   // be 2.
   GLuint active_texture_unit;
 
-  // Cached values of the currently assigned viewport dimensions.
-  GLsizei viewport_max_width;
-  GLsizei viewport_max_height;
-
   // The currently bound array buffer. If this is 0 it is illegal to call
   // glVertexAttribPointer.
   BufferManager::BufferInfo::Ref bound_array_buffer;
 
   // Which textures are bound to texture units through glActiveTexture.
-  scoped_array<TextureUnit> texture_units;
+  std::vector<TextureUnit> texture_units;
 
   // Class that manages vertex attribs.
   VertexAttribManager::Ref vertex_attrib_manager;