From ac5e402c29ddab5b41afbaeca96c499a8d1f0b1b Mon Sep 17 00:00:00 2001 From: "reveman@chromium.org" Date: Fri, 24 Jan 2014 12:44:39 +0000 Subject: 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 --- gpu/command_buffer/service/gles2_cmd_decoder.cc | 3 +-- 1 file changed, 1 insertion(+), 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; } -- cgit v1.1