Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(175)

Unified Diff: gpu/command_buffer/service/query_manager.cc

Issue 11275088: Remove implicit scoped_refptr operator T* Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/service/program_manager.cc ('k') | gpu/command_buffer/service/renderbuffer_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « gpu/command_buffer/service/program_manager.cc ('k') | gpu/command_buffer/service/renderbuffer_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698