command_buffer: Defer restoring of FBO bindings when changing virtual contexts

gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.cc

Index: gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.cc b/gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.cc
index 89baa809e487ad482f30f0039604fc8fd0a1c940..a0169e3c98e1eee3fc82da0455fa159ce23437da 100644
--- a/gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.cc
+++ b/gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.cc
@@ -259,7 +259,7 @@ bool BindFramebufferTexture2D(GLenum target,
   return true;
 }
 
-void DoCopyTexImage2D(const gpu::gles2::GLES2Decoder* decoder,
+void DoCopyTexImage2D(gpu::gles2::GLES2Decoder* decoder,
                       GLenum source_target,
                       GLuint source_id,
                       GLenum dest_target,
@@ -284,10 +284,10 @@ void DoCopyTexImage2D(const gpu::gles2::GLES2Decoder* decoder,
   decoder->RestoreTextureState(dest_id);
   decoder->RestoreTextureUnitBindings(0);
   decoder->RestoreActiveTexture();
-  decoder->RestoreFramebufferBindings();
+  decoder->MarkFramebufferBindingsChanged();
 }
 
-void DoCopyTexSubImage2D(const gpu::gles2::GLES2Decoder* decoder,
+void DoCopyTexSubImage2D(gpu::gles2::GLES2Decoder* decoder,
                          GLenum source_target,
                          GLuint source_id,
                          GLenum dest_target,
@@ -316,7 +316,7 @@ void DoCopyTexSubImage2D(const gpu::gles2::GLES2Decoder* decoder,
   decoder->RestoreTextureState(dest_id);
   decoder->RestoreTextureUnitBindings(0);
   decoder->RestoreActiveTexture();
-  decoder->RestoreFramebufferBindings();
+  decoder->MarkFramebufferBindingsChanged();
 }
 
 }  // namespace
@@ -403,7 +403,7 @@ void CopyTextureCHROMIUMResourceManager::Destroy() {
 }
 
 void CopyTextureCHROMIUMResourceManager::DoCopyTexture(
-    const gles2::GLES2Decoder* decoder,
+    gles2::GLES2Decoder* decoder,
     GLenum source_target,
     GLuint source_id,
     GLenum source_internal_format,
@@ -448,7 +448,7 @@ void CopyTextureCHROMIUMResourceManager::DoCopyTexture(
 }
 
 void CopyTextureCHROMIUMResourceManager::DoCopySubTexture(
-    const gles2::GLES2Decoder* decoder,
+    gles2::GLES2Decoder* decoder,
     GLenum source_target,
     GLuint source_id,
     GLenum source_internal_format,
@@ -495,7 +495,7 @@ void CopyTextureCHROMIUMResourceManager::DoCopySubTexture(
 }
 
 void CopyTextureCHROMIUMResourceManager::DoCopySubTextureWithTransform(
-    const gles2::GLES2Decoder* decoder,
+    gles2::GLES2Decoder* decoder,
     GLenum source_target,
     GLuint source_id,
     GLenum source_internal_format,
@@ -523,7 +523,7 @@ void CopyTextureCHROMIUMResourceManager::DoCopySubTextureWithTransform(
 }
 
 void CopyTextureCHROMIUMResourceManager::DoCopyTextureWithTransform(
-    const gles2::GLES2Decoder* decoder,
+    gles2::GLES2Decoder* decoder,
     GLenum source_target,
     GLuint source_id,
     GLenum dest_target,
@@ -543,7 +543,7 @@ void CopyTextureCHROMIUMResourceManager::DoCopyTextureWithTransform(
 }
 
 void CopyTextureCHROMIUMResourceManager::DoCopyTextureInternal(
-    const gles2::GLES2Decoder* decoder,
+    gles2::GLES2Decoder* decoder,
     GLenum source_target,
     GLuint source_id,
     GLenum dest_target,
@@ -757,7 +757,7 @@ void CopyTextureCHROMIUMResourceManager::DoCopyTextureInternal(
   decoder->RestoreActiveTexture();
   decoder->RestoreProgramBindings();
   decoder->RestoreBufferBindings();
-  decoder->RestoreFramebufferBindings();
+  decoder->MarkFramebufferBindingsChanged();
   decoder->RestoreGlobalState();
 }