| Index: gpu/command_buffer/service/query_manager.cc
|
| diff --git a/gpu/command_buffer/service/query_manager.cc b/gpu/command_buffer/service/query_manager.cc
|
| index 45a3a56dba1de2c17937358e4975b9e2ce322acf..e431be9b37059d20ddd67c0c9446d39238efe3a0 100644
|
| --- a/gpu/command_buffer/service/query_manager.cc
|
| +++ b/gpu/command_buffer/service/query_manager.cc
|
| @@ -232,7 +232,7 @@ QueryManager::~QueryManager() {
|
| void QueryManager::Destroy(bool have_context) {
|
| pending_queries_.clear();
|
| while (!queries_.empty()) {
|
| - Query* query = queries_.begin()->second;
|
| + Query* query = queries_.begin()->second.get();
|
| query->Destroy(have_context);
|
| queries_.erase(queries_.begin());
|
| }
|
| @@ -243,14 +243,14 @@ QueryManager::Query* QueryManager::CreateQuery(
|
| Query::Ref query;
|
| switch (target) {
|
| case GL_COMMANDS_ISSUED_CHROMIUM:
|
| - query = new CommandsIssuedQuery(this, target, shm_id, shm_offset);
|
| - break;
|
| + query = new CommandsIssuedQuery(this, target, shm_id, shm_offset);
|
| + break;
|
| case GL_LATENCY_QUERY_CHROMIUM:
|
| - query = new CommandLatencyQuery(this, target, shm_id, shm_offset);
|
| - break;
|
| + query = new CommandLatencyQuery(this, target, shm_id, shm_offset);
|
| + break;
|
| case GL_GET_ERROR_QUERY_CHROMIUM:
|
| - query = new GetErrorQuery(this, target, shm_id, shm_offset);
|
| - break;
|
| + query = new GetErrorQuery(this, target, shm_id, shm_offset);
|
| + break;
|
| default: {
|
| GLuint service_id = 0;
|
| glGenQueriesARB(1, &service_id);
|
| @@ -269,13 +269,14 @@ QueryManager::Query* QueryManager::CreateQuery(
|
| QueryManager::Query* QueryManager::GetQuery(
|
| GLuint client_id) {
|
| QueryMap::iterator it = queries_.find(client_id);
|
| + return .get()());
|
| return it != queries_.end() ? it->second : NULL;
|
| }
|
|
|
| void QueryManager::RemoveQuery(GLuint client_id) {
|
| QueryMap::iterator it = queries_.find(client_id);
|
| if (it != queries_.end()) {
|
| - Query* query = it->second;
|
| + Query* query = it->second.get();
|
| RemovePendingQuery(query);
|
| query->MarkAsDeleted();
|
| queries_.erase(it);
|
|
|