Restore samplers' state across virtualized GL contexts.

gpu/command_buffer/service/gl_state_restorer_impl.cc

 // 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.
 
 #include "gpu/command_buffer/service/gl_state_restorer_impl.h"
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/query_manager.h"
 
 namespace gpu {
@@ skipping 13 matching lines @@
 
 void GLStateRestorerImpl::RestoreState(const gl::GLStateRestorer* prev_state) {
   DCHECK(decoder_.get());
   const GLStateRestorerImpl* restorer_impl =
       static_cast<const GLStateRestorerImpl*>(prev_state);
 
   decoder_->RestoreState(
       restorer_impl ? restorer_impl->GetContextState() : NULL);
 }
 
-void GLStateRestorerImpl::RestoreAllTextureUnitBindings() {
+void GLStateRestorerImpl::RestoreAllTextureUnitAndSamplerBindings() {
   DCHECK(decoder_.get());
-  decoder_->RestoreAllTextureUnitBindings(NULL);
+  decoder_->RestoreAllTextureUnitAndSamplerBindings(NULL);
 }
 
 void GLStateRestorerImpl::RestoreActiveTexture() {
   DCHECK(decoder_.get());
   decoder_->RestoreActiveTexture();
 }
 
 void GLStateRestorerImpl::RestoreActiveTextureUnitBinding(unsigned int target) {
   DCHECK(decoder_.get());
   decoder_->RestoreActiveTextureUnitBinding(target);
@@ skipping 33 matching lines @@
   DCHECK(decoder_.get());
   decoder_->GetQueryManager()->ResumeQueries();
 }
 
 const gles2::ContextState* GLStateRestorerImpl::GetContextState() const {
   DCHECK(decoder_.get());
   return decoder_->GetContextState();
 }
 
 }  // namespace gpu