Disable FRAMEBUFFER_SRGB when restoring from a null context state

gpu/command_buffer/service/context_state.cc

Index: gpu/command_buffer/service/context_state.cc
diff --git a/gpu/command_buffer/service/context_state.cc b/gpu/command_buffer/service/context_state.cc
index c19ffa5272b5746ecf65646b057a25364cd65693..5bb4ef16df4208aae14b108e612137d31c2f9d97 100644
--- a/gpu/command_buffer/service/context_state.cc
+++ b/gpu/command_buffer/service/context_state.cc
@@ -221,7 +221,7 @@ ContextState::ContextState(FeatureInfo* feature_info,
       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();
@@ -495,7 +495,9 @@ void ContextState::RestoreState(const ContextState* prev_state) {
   RestoreIndexedUniformBufferBindings(prev_state);
   RestoreGlobalState(prev_state);
 
-  if (prev_state && framebuffer_srgb_ != prev_state->framebuffer_srgb_) {
+  if (!prev_state) {
+    framebuffer_srgb_ = FRAMEBUFFER_SRGB_UNDEFINED;

[Zhenyao Mo, 2016/08/17 17:21:09]

Per our discussion, this should be DISABLED.

Actually you can revert all the changes in context_state.h and context_state.cc.

[qiankun, 2016/08/18 00:19:56]

I still cannot revert these changes. There are still some situations where
context is restored from a null context but it isn't a context initialization.
glDisable(FRAMEBUFFER_SRGB) in context initialization doesn't help in such
situation.

+  } else if (framebuffer_srgb_ != prev_state->framebuffer_srgb_) {
     // FRAMEBUFFER_SRGB will be restored lazily at render time.
     framebuffer_srgb_ = prev_state->framebuffer_srgb_;
   }
@@ -687,10 +689,11 @@ PixelStoreParams ContextState::GetUnpackParams(Dimension dimension) {
   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;
 }