summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorreveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-24 12:44:39 +0000
committerreveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-24 12:44:39 +0000
commitac5e402c29ddab5b41afbaeca96c499a8d1f0b1b (patch)
tree3fcfbf4fdb147ca10656b28f50bd2b2712bf1552 /gpu
parent2d9f2a797d43c8f91673c0501b175b62cd354402 (diff)
downloadchromium_src-ac5e402c29ddab5b41afbaeca96c499a8d1f0b1b.zip
chromium_src-ac5e402c29ddab5b41afbaeca96c499a8d1f0b1b.tar.gz
chromium_src-ac5e402c29ddab5b41afbaeca96c499a8d1f0b1b.tar.bz2
gpu: Fix crash in GLES2DecoderImpl::Destroy.
GLES2DecoderImpl::Destroy can be called without group_ set. BUG=337536 Review URL: https://codereview.chromium.org/145273010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246852 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 1d164cb..d35a8b1 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -3296,9 +3296,8 @@ void GLES2DecoderImpl::Destroy(bool have_context) {
// by the context group.
async_pixel_transfer_manager_.reset();
- framebuffer_manager()->RemoveObserver(this);
-
if (group_.get()) {
+ framebuffer_manager()->RemoveObserver(this);
group_->Destroy(this, have_context);
group_ = NULL;
}