Disable FRAMEBUFFER_SRGB when restoring from a null context state

gpu/command_buffer/service/context_state.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/context_state.h"
 
 #include <stddef.h>
 
 #include <cmath>
 
@@ skipping 203 matching lines @@
 }
 
 ContextState::ContextState(FeatureInfo* feature_info,
                            ErrorStateClient* error_state_client,
                            Logger* logger)
     : active_texture_unit(0),
       bound_renderbuffer_valid(false),
       pack_reverse_row_order(false),
       ignore_cached_state(false),
       fbo_binding_for_scissor_workaround_dirty(false),
-      framebuffer_srgb_(false),
+      framebuffer_srgb_(FRAMEBUFFER_SRGB_DISABLED),
       feature_info_(feature_info),
       error_state_(ErrorState::Create(error_state_client, logger)) {
   Initialize();
 }
 
 ContextState::~ContextState() {
 }
 
 void ContextState::RestoreTextureUnitBindings(
     GLuint unit, const ContextState* prev_state) const {
@@ skipping 253 matching lines @@
 
 void ContextState::RestoreState(const ContextState* prev_state) {
   RestoreAllTextureUnitBindings(prev_state);
   RestoreVertexAttribs();
   RestoreBufferBindings();
   RestoreRenderbufferBindings();
   RestoreProgramSettings(prev_state, true);
   RestoreIndexedUniformBufferBindings(prev_state);
   RestoreGlobalState(prev_state);
 
-  if (prev_state && framebuffer_srgb_ != prev_state->framebuffer_srgb_) {
+  if (!prev_state) {
+    framebuffer_srgb_ = FRAMEBUFFER_SRGB_UNDEFINED;
+  } else if (framebuffer_srgb_ != prev_state->framebuffer_srgb_) {
     // FRAMEBUFFER_SRGB will be restored lazily at render time.
     framebuffer_srgb_ = prev_state->framebuffer_srgb_;
   }
 }
 
 ErrorState* ContextState::GetErrorState() {
   return error_state_.get();
 }
 
 void ContextState::EnableDisable(GLenum pname, bool enable) const {
@@ skipping 171 matching lines @@
   DCHECK_EQ(0, unpack_skip_images);
   PixelStoreParams params;
   params.alignment = unpack_alignment;
   params.row_length = unpack_row_length;
   if (dimension == k3D) {
     params.image_height = unpack_image_height;
   }
   return params;
 }
 
-void ContextState::EnableDisableFramebufferSRGB(bool enable) {
+void ContextState::EnableDisableFramebufferSRGB(FramebufferSRGBState enable) {
   if (framebuffer_srgb_ == enable)
     return;
-  EnableDisable(GL_FRAMEBUFFER_SRGB, enable);
+  EnableDisable(GL_FRAMEBUFFER_SRGB,
+      enable == FRAMEBUFFER_SRGB_ENABLED ? true : false);
   framebuffer_srgb_ = enable;
 }
 
 void ContextState::InitStateManual(const ContextState*) const {
   // Here we always reset the states whether it's different from previous ones.
   // We have very limited states here; also, once we switch to MANGLE, MANGLE
   // will opmitize this.
   UpdatePackParameters();
   UpdateUnpackParameters();
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/context_state_impl_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu