command_buffer: Defer restoring of FBO bindings when changing virtual contexts

gpu/command_buffer/service/gles2_cmd_decoder_autogen.h

Index: gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
index 9d630fb7dd7f8433fc4144cb139b66e0ef8efcc6..a98ea65f5283033917649b6766372291feed2e33 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
@@ -509,7 +509,7 @@ error::Error GLES2DecoderImpl::HandleColorMask(uint32_t immediate_data_size,
     state_.color_mask_green = green;
     state_.color_mask_blue = blue;
     state_.color_mask_alpha = alpha;
-    framebuffer_state_.clear_state_dirty = true;
+    framebuffer_state_.set_draw_framebuffer_clear_state_dirty(true);
   }
   return error::kNoError;
 }
@@ -947,7 +947,7 @@ error::Error GLES2DecoderImpl::HandleDepthMask(uint32_t immediate_data_size,
   GLboolean flag = static_cast<GLboolean>(c.flag);
   if (state_.depth_mask != flag) {
     state_.depth_mask = flag;
-    framebuffer_state_.clear_state_dirty = true;
+    framebuffer_state_.set_draw_framebuffer_clear_state_dirty(true);
   }
   return error::kNoError;
 }
@@ -2669,7 +2669,7 @@ error::Error GLES2DecoderImpl::HandleStencilMask(uint32_t immediate_data_size,
       state_.stencil_back_writemask != mask) {
     state_.stencil_front_writemask = mask;
     state_.stencil_back_writemask = mask;
-    framebuffer_state_.clear_state_dirty = true;
+    framebuffer_state_.set_draw_framebuffer_clear_state_dirty(true);
   }
   return error::kNoError;
 }
@@ -2700,7 +2700,7 @@ error::Error GLES2DecoderImpl::HandleStencilMaskSeparate(
     if (face == GL_BACK || face == GL_FRONT_AND_BACK) {
       state_.stencil_back_writemask = mask;
     }
-    framebuffer_state_.clear_state_dirty = true;
+    framebuffer_state_.set_draw_framebuffer_clear_state_dirty(true);
   }
   return error::kNoError;
 }
@@ -5048,7 +5048,7 @@ bool GLES2DecoderImpl::SetCapabilityState(GLenum cap, bool enabled) {
       state_.enable_flags.depth_test = enabled;
       if (state_.enable_flags.cached_depth_test != enabled ||
           state_.ignore_cached_state) {
-        framebuffer_state_.clear_state_dirty = true;
+        framebuffer_state_.set_draw_framebuffer_clear_state_dirty(true);
       }
       return false;
     case GL_DITHER:
@@ -5095,7 +5095,7 @@ bool GLES2DecoderImpl::SetCapabilityState(GLenum cap, bool enabled) {
       state_.enable_flags.stencil_test = enabled;
       if (state_.enable_flags.cached_stencil_test != enabled ||
           state_.ignore_cached_state) {
-        framebuffer_state_.clear_state_dirty = true;
+        framebuffer_state_.set_draw_framebuffer_clear_state_dirty(true);
       }
       return false;
     case GL_RASTERIZER_DISCARD: