diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-20 02:33:31 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-20 02:33:31 +0000 |
| commit | 0a7be8d8aed47cc460e1e848092377c2c426b89c (patch) | |
| tree | 3f2e8403302ac58c21ca3f69a78fb251c4dd9050 /webkit/gpu | |
| parent | b51f6ab136aa37f932c3d268693238f8f6b9e52f (diff) | |
| download | chromium_src-0a7be8d8aed47cc460e1e848092377c2c426b89c.zip chromium_src-0a7be8d8aed47cc460e1e848092377c2c426b89c.tar.gz chromium_src-0a7be8d8aed47cc460e1e848092377c2c426b89c.tar.bz2 | |
Fix for GLInProcessContext
TEST=DRT no longer crashes
BUG=none
TBR=apatrick@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10407055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138049 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/gpu')
| -rw-r--r-- | webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc index d08280be..5c36c36 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc @@ -313,6 +313,9 @@ GLInProcessContext::Error GLInProcessContext::GetError() { } bool GLInProcessContext::IsCommandBufferContextLost() { + if (!command_buffer_.get()) { + return true; + } CommandBuffer::State state = command_buffer_->GetState(); return state.error == ::gpu::error::kLostContext; } @@ -510,7 +513,7 @@ void GLInProcessContext::Destroy() { command_buffer_.reset(); if (decoder_.get()) { - decoder_->Destroy(context_lost); + decoder_->Destroy(!context_lost); } } |