diff options
| author | dyen <dyen@chromium.org> | 2015-07-28 14:34:37 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-28 21:35:14 +0000 |
| commit | 4823ae39c9fab9acca0e294e1ce7ca8d4bb77e13 (patch) | |
| tree | 5ff6891fc4fd2041d783ab7e7a6a48d7368c7e22 /gpu | |
| parent | 48d359b13c0f60e444280afc03df8dfeb8ebe41d (diff) | |
| download | chromium_src-4823ae39c9fab9acca0e294e1ce7ca8d4bb77e13.zip chromium_src-4823ae39c9fab9acca0e294e1ce7ca8d4bb77e13.tar.gz chromium_src-4823ae39c9fab9acca0e294e1ce7ca8d4bb77e13.tar.bz2 | |
Make sure active queries map is cleared upon query manager destroy.
When the active queries map was not cleared, it could possibly
cause an assert in QueryManager::~QueryManager() when it validates
that all queries have been deleted. This is because the active
queries map holds a reference to the query.
BUG=509896
Review URL: https://codereview.chromium.org/1261653003
Cr-Commit-Position: refs/heads/master@{#340770}
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/query_manager.cc | 1 |
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 2457a41..ab9dd63 100644 --- a/gpu/command_buffer/service/query_manager.cc +++ b/gpu/command_buffer/service/query_manager.cc @@ -787,6 +787,7 @@ QueryManager::~QueryManager() { void QueryManager::Destroy(bool have_context) { pending_queries_.clear(); pending_transfer_queries_.clear(); + active_queries_.clear(); while (!queries_.empty()) { Query* query = queries_.begin()->second.get(); query->Destroy(have_context); |