gpu: Use decoder state restoration for scoped_binders

ui/gl/scoped_binders.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 UI_GL_SCOPED_BINDERS_H_
 #define UI_GL_SCOPED_BINDERS_H_
 
 #include "base/macros.h"
 #include "ui/gl/gl_export.h"
 
@@ skipping 15 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ScopedFramebufferBinder);
 };
 
 class GL_EXPORT ScopedActiveTexture {
  public:
   ScopedActiveTexture(unsigned int texture);
   ~ScopedActiveTexture();
 
  private:
-  // TODO(dcastagna): Use GLStateRestorer.
+  // Whenever possible we prefer to use the current GLContext's
+  // GLStateRestorer to maximize driver compabitility.
+  GLStateRestorer* state_restorer_;
+
+  // Failing that we use GL calls to save and restore state.
   int old_texture_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedActiveTexture);
 };
 
 class GL_EXPORT ScopedTextureBinder {
  public:
   ScopedTextureBinder(unsigned int target, unsigned int id);
   ~ScopedTextureBinder();
 
  private:
   // Whenever possible we prefer to use the current GLContext's
   // GLStateRestorer to maximize driver compabitility.
   GLStateRestorer* state_restorer_;
 
   // Failing that we use GL calls to save and restore state.
   int target_;
   int old_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedTextureBinder);
 };
 
 class GL_EXPORT ScopedUseProgram {
  public:
   ScopedUseProgram(unsigned int program);
   ~ScopedUseProgram();
 
  private:
-  // TODO(dcastagna): Use GLStateRestorer.
+  // Whenever possible we prefer to use the current GLContext's
+  // GLStateRestorer to maximize driver compabitility.
+  GLStateRestorer* state_restorer_;
+
+  // Failing that we use GL calls to save and restore state.
   int old_program_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedUseProgram);
 };
 
 class GL_EXPORT ScopedVertexAttribArray {
  public:
   ScopedVertexAttribArray(unsigned int index,
                           int size,
                           unsigned int type,
                           char normalized,
                           int stride,
                           const void* pointer);
   ~ScopedVertexAttribArray();
 
  private:
-  // TODO(dcastagna): Use GLStateRestorer.
+  // Whenever possible we prefer to use the current GLContext's
+  // GLStateRestorer to maximize driver compabitility.
+  GLStateRestorer* state_restorer_;
+
+  // Failing that we use GL calls to save and restore state.
   int buffer_;
   int enabled_;
   int index_;
   int size_;
   int type_;
   int normalized_;
   int stride_;
   void* pointer_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedVertexAttribArray);
 };
 
 class GL_EXPORT ScopedBufferBinder {
  public:
   ScopedBufferBinder(unsigned int target, unsigned int index);
   ~ScopedBufferBinder();
 
  private:
-  // TODO(dcastagna): Use GLStateRestorer.
+  // Whenever possible we prefer to use the current GLContext's
+  // GLStateRestorer to maximize driver compabitility.
+  GLStateRestorer* state_restorer_;
+
+  // Failing that we use GL calls to save and restore state.
   int target_;
   int old_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedBufferBinder);
 };
 
 class GL_EXPORT ScopedViewport {
  public:
   ScopedViewport(int x, int y, int width, int height);
   ~ScopedViewport();
@@ skipping 37 matching lines @@
  private:
   unsigned capability_;
   unsigned char enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedCapability);
 };
 
 }  // namespace gl
 
 #endif  // UI_GL_SCOPED_BINDERS_H_