diff options
| author | dyen <dyen@chromium.org> | 2015-03-26 16:32:51 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-26 23:33:50 +0000 |
| commit | 8ef6598843c638fe973a9f157386788341b83e4f (patch) | |
| tree | da78a67e90eef5e4f312b0437498940360fa1283 /gpu | |
| parent | 7018ce63853e5e7464e6604015a76fe82886133e (diff) | |
| download | chromium_src-8ef6598843c638fe973a9f157386788341b83e4f.zip chromium_src-8ef6598843c638fe973a9f157386788341b83e4f.tar.gz chromium_src-8ef6598843c638fe973a9f157386788341b83e4f.tar.bz2 | |
Only destroy GPUTracer if the pointer is not empty.
R=vmiura@chromium.org
BUG=471049, 467202
Review URL: https://codereview.chromium.org/1033093002
Cr-Commit-Position: refs/heads/master@{#322498}
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index 2d6425c..3abe199 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -3756,8 +3756,10 @@ void GLES2DecoderImpl::Destroy(bool have_context) { async_pixel_transfer_manager_.reset(); // Destroy the GPU Tracer which may own some in process GPU Timings. - gpu_tracer_->Destroy(have_context); - gpu_tracer_ = NULL; + if (gpu_tracer_) { + gpu_tracer_->Destroy(have_context); + gpu_tracer_.reset(); + } if (group_.get()) { framebuffer_manager()->RemoveObserver(this); |