During virtual context switches only restore texture units that have changed from the previous cont…

gpu/command_buffer/service/gl_state_restorer_impl.h

Index: gpu/command_buffer/service/gl_state_restorer_impl.h
diff --git a/gpu/command_buffer/service/gl_state_restorer_impl.h b/gpu/command_buffer/service/gl_state_restorer_impl.h
index 032bf7251867059477a30c649d4324d863360af4..29f374618456a0a2839a8bf3487dadb3ad12592e 100644
--- a/gpu/command_buffer/service/gl_state_restorer_impl.h
+++ b/gpu/command_buffer/service/gl_state_restorer_impl.h
@@ -15,6 +15,7 @@
 namespace gpu {
 namespace gles2 {
 class GLES2Decoder;
+struct ContextState;
 }
 
 // This class implements a GLStateRestorer that forwards to a GLES2Decoder.
@@ -24,11 +25,12 @@ class GPU_EXPORT GLStateRestorerImpl : public gfx::GLStateRestorer {
    virtual ~GLStateRestorerImpl();
 
    virtual bool IsInitialized() OVERRIDE;
-   virtual void RestoreState() OVERRIDE;
+   virtual void RestoreState(const gfx::GLStateRestorer* prev_state) OVERRIDE;
    virtual void RestoreAllTextureUnitBindings() OVERRIDE;
    virtual void RestoreFramebufferBindings() OVERRIDE;
 
  private:
+   const gles2::ContextState* GetContextState() const;
    base::WeakPtr<gles2::GLES2Decoder> decoder_;
 
    DISALLOW_COPY_AND_ASSIGN(GLStateRestorerImpl);