summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorreveman@google.com <reveman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-18 16:10:48 +0000
committerreveman@google.com <reveman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-18 16:10:48 +0000
commit99bb5410f37928816b9701bf3d35464123c3e481 (patch)
treeb67bf8cb716e35707084def359f1a753a0080834 /gpu
parentd17310cb05700214fa68a0d3961de5a788d7a4a7 (diff)
downloadchromium_src-99bb5410f37928816b9701bf3d35464123c3e481.zip
chromium_src-99bb5410f37928816b9701bf3d35464123c3e481.tar.gz
chromium_src-99bb5410f37928816b9701bf3d35464123c3e481.tar.bz2
gpu: Clear pending_transfer_queries_ in QueryManager::Destroy.
Failing to do this can cause query_count_ to be non-zero at the time the destructor is called. BUG=176811 TBR=gman Review URL: https://codereview.chromium.org/12301010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183127 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/service/query_manager.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/gpu/command_buffer/service/query_manager.cc b/gpu/command_buffer/service/query_manager.cc
index cc4de7a..3b7e8c0 100644
--- a/gpu/command_buffer/service/query_manager.cc
+++ b/gpu/command_buffer/service/query_manager.cc
@@ -320,6 +320,7 @@ QueryManager::~QueryManager() {
void QueryManager::Destroy(bool have_context) {
pending_queries_.clear();
+ pending_transfer_queries_.clear();
while (!queries_.empty()) {
Query* query = queries_.begin()->second;
query->Destroy(have_context);