commit | dbfb90d4dac51818e040c01ee2986bf64a18dfe3 | [log] [tgz] |
---|---|---|
author | dyen <[email protected]> | Thu Mar 26 02:41:46 2015 |
committer | Commit bot <[email protected]> | Thu Mar 26 02:42:27 2015 |
tree | d921f04588e05d514dc91fd0f7b48b067bb930ba | |
parent | a51f1167d1600b4a54aad7e6aa616d892bd7ebc9 [diff] [blame] |
Added Destroy() functions for GPUTimer and GPUTracer/GPUTrace. BUG=467202 TEST=Shut down during gpu.device trace has no warnings. Review URL: https://codereview.chromium.org/1018773002 Cr-Commit-Position: refs/heads/master@{#322304}
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index 0886768..a9cb5fe 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -3755,6 +3755,10 @@ // by the context group. 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 (group_.get()) { framebuffer_manager()->RemoveObserver(this); group_->Destroy(this, have_context);