Revert of Report lost context from GLES2Implementation based on share group state.

gpu/command_buffer/client/gles2_implementation.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.
 
 // A class to emulate GLES2 over command buffers.
 
 #include "gpu/command_buffer/client/gles2_implementation.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
@@ skipping 309 matching lines @@
 }
 
 IdAllocator* GLES2Implementation::GetIdAllocator(int namespace_id) const {
   if (namespace_id == id_namespaces::kQueries)
     return query_id_allocator_.get();
   NOTREACHED();
   return NULL;
 }
 
 void GLES2Implementation::OnGpuControlLostContext() {
+#if DCHECK_IS_ON()
   // This should never occur more than once.
-  DCHECK(!lost_context_callback_run_);
-  lost_context_callback_run_ = true;
-  share_group_->Lose();
+  DCHECK(!lost_context_);
+  lost_context_ = true;
+#endif
   if (!lost_context_callback_.is_null())
     lost_context_callback_.Run();
 }
 
 void GLES2Implementation::OnGpuControlErrorMessage(const char* message,
                                                    int32_t id) {
   if (!error_message_callback_.is_null())
     error_message_callback_.Run(message, id);
 }
 
@@ skipping 15 matching lines @@
 
 void GLES2Implementation::FreeEverything() {
   WaitForCmd();
   query_tracker_->Shrink();
   FreeUnusedSharedMemory();
   transfer_buffer_->Free();
   helper_->FreeRingBuffer();
 }
 
 void GLES2Implementation::RunIfContextNotLost(const base::Closure& callback) {
-  if (!lost_context_callback_run_)
+  if (!helper_->IsContextLost())
     callback.Run();
 }
 
 void GLES2Implementation::SignalSyncToken(const gpu::SyncToken& sync_token,
                                           const base::Closure& callback) {
   if (sync_token.HasData() &&
       (sync_token.verified_flush() ||
        gpu_control_->CanWaitUnverifiedSyncToken(&sync_token))) {
 
     gpu::SyncToken intermediate_sync_token = sync_token;
@@ skipping 4249 matching lines @@
     for (int32_t i = 0; i < result->GetNumResults(); ++i) {
       GPU_CLIENT_LOG("  " << i << ": " << result->GetData()[i]);
     }
   });
   CheckGLError();
 }
 
 GLenum GLES2Implementation::GetGraphicsResetStatusKHR() {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetGraphicsResetStatusKHR()");
-  // If any context (including ourselves) has seen itself become lost,
-  // then it will have told the ShareGroup, so just report its status.
-  if (share_group_->IsLost())
+  // If we can't make command buffers then the context is lost.
+  if (gpu_control_->IsGpuChannelLost())
     return GL_UNKNOWN_CONTEXT_RESET_KHR;
+  // Otherwise, check the command buffer if it is lost.
+  if (helper_->IsContextLost()) {
+    // TODO(danakj): We could GetLastState() off the CommandBuffer and return
+    // the actual reason here if we cared to.
+    return GL_UNKNOWN_CONTEXT_RESET_KHR;
+  }
   return GL_NO_ERROR;
 }
 
 void GLES2Implementation::Swap() {
   SwapBuffers();
 }
 
 void GLES2Implementation::PartialSwapBuffers(const gfx::Rect& sub_buffer) {
   PostSubBufferCHROMIUM(
       sub_buffer.x(), sub_buffer.y(), sub_buffer.width(), sub_buffer.height());
@@ skipping 716 matching lines @@
   }
 
   if (query_tracker_->BeginQuery(id, target, this))
     CheckGLError();
 }
 
 void GLES2Implementation::EndQueryEXT(GLenum target) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] EndQueryEXT("
                  << GLES2Util::GetStringQueryTarget(target) << ")");
+  // Don't do anything if the context is lost.
+  if (helper_->IsContextLost()) {
+    return;
+  }
+
   if (query_tracker_->EndQuery(target, this))
     CheckGLError();
 }
 
 void GLES2Implementation::QueryCounterEXT(GLuint id, GLenum target) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] QueryCounterEXT("
                  << id
                  << ", " << GLES2Util::GetStringQueryTarget(target) << ")");
 
@@ skipping 1421 matching lines @@
   cached_extensions_.clear();
 }
 
 // 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/client/gles2_implementation_impl_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu