Merge 106394 - Fixed bugs with Pepper 3D under dynamic GPU switching.

content/renderer/gpu/renderer_gl_context.cc

 // Copyright (c) 2011 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 "content/renderer/gpu/renderer_gl_context.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
@@ skipping 240 matching lines @@
     last_error_ = SUCCESS;
     return old_error;
   } else {
     // All command buffer errors are unrecoverable. The error is treated as a
     // lost context: destroy the context and create another one.
     return CONTEXT_LOST;
   }
 }
 
 bool RendererGLContext::IsCommandBufferContextLost() {
+  // If the channel shut down unexpectedly, let that supersede the
+  // command buffer's state.
+  if (channel_->state() == GpuChannelHost::kLost)
+    return true;
   gpu::CommandBuffer::State state = command_buffer_->GetLastState();
   return state.error == gpu::error::kLostContext;
 }
 
 CommandBufferProxy* RendererGLContext::GetCommandBufferProxy() {
   return command_buffer_;
 }
 
 bool RendererGLContext::SetSurfaceVisible(bool visible) {
   return GetCommandBufferProxy()->SetSurfaceVisible(visible);
@@ skipping 189 matching lines @@
 void RendererGLContext::OnContextLost() {
   if (!context_lost_callback_.is_null()) {
     RendererGLContext::ContextLostReason reason = kUnknown;
     if (command_buffer_) {
       reason = ConvertReason(
           command_buffer_->GetLastState().context_lost_reason);
     }
     context_lost_callback_.Run(reason);
   }
 }