Remove redundant codepath for webgl api blocking

gpu/ipc/service/gpu_command_buffer_stub.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/ipc/service/gpu_command_buffer_stub.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 442 matching lines @@
     Send(wait_for_token_->reply.release());
     wait_for_token_.reset();
   }
   if (wait_for_get_offset_) {
     Send(wait_for_get_offset_->reply.release());
     wait_for_get_offset_.reset();
   }
 
   if (initialized_) {
     GpuChannelManager* gpu_channel_manager = channel_->gpu_channel_manager();
-    if ((surface_handle_ == kNullSurfaceHandle) && !active_url_.is_empty())
+    // If we are currently shutting down the GPU process to help with recovery
+    // (exit_on_context_lost workaround), then don't tell the browser about
+    // offscreen context destruction here since it's not client-invoked, and
+    // might bypass the 3D API blocking logic.
+    if ((surface_handle_ == gpu::kNullSurfaceHandle) && !active_url_.is_empty()
+        && !gpu_channel_manager->is_exiting_for_lost_context()) {
       gpu_channel_manager->delegate()->DidDestroyOffscreenContext(active_url_);
+    }
   }
 
   if (decoder_)
     decoder_->set_engine(NULL);
 
   // The scheduler has raw references to the decoder and the command buffer so
   // destroy it before those.
   executor_.reset();
 
   sync_point_client_.reset();
@@ skipping 610 matching lines @@
   DCHECK(command_buffer_);
   CommandBuffer::State state = command_buffer_->GetLastState();
   bool was_lost = state.error == error::kLostContext;
 
   if (was_lost) {
     bool was_lost_by_robustness =
         decoder_ && decoder_->WasContextLostByRobustnessExtension();
 
     // Work around issues with recovery by allowing a new GPU process to launch.
     if ((was_lost_by_robustness ||
-         context_group_->feature_info()->workarounds().exit_on_context_lost) &&
-        !channel_->gpu_channel_manager()->gpu_preferences().single_process &&
-        !channel_->gpu_channel_manager()->gpu_preferences().in_process_gpu) {
-      LOG(ERROR) << "Exiting GPU process because some drivers cannot recover"
-                 << " from problems.";
-      // Signal the message loop to quit to shut down other threads
-      // gracefully.
-      base::MessageLoop::current()->QuitNow();
+         context_group_->feature_info()->workarounds().exit_on_context_lost)) {
+      channel_->gpu_channel_manager()->MaybeExitOnContextLost();
     }
 
     // Lose all other contexts if the reset was triggered by the robustness
     // extension instead of being synthetic.
     if (was_lost_by_robustness &&
         (gfx::GLContext::LosesAllContextsOnContextLost() ||
          use_virtualized_gl_context_)) {
       channel_->LoseAllContexts();
     }
   }
@@ skipping 20 matching lines @@
                                                     result));
 }
 
 void GpuCommandBufferStub::SendUpdateVSyncParameters(base::TimeTicks timebase,
                                                      base::TimeDelta interval) {
   Send(new GpuCommandBufferMsg_UpdateVSyncParameters(route_id_, timebase,
                                                      interval));
 }
 
 }  // namespace gpu