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

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

Issue 16293004: Update gpu/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 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
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 a6efd47603b386c99b5b08a8fdad3178324278fe..a1766614987302962c70b810adcb88fe93fe8b85 100644
--- a/gpu/command_buffer/service/query_manager.cc
+++ b/gpu/command_buffer/service/query_manager.cc
@@ -325,7 +325,7 @@ void QueryManager::Destroy(bool have_context) {
pending_queries_.clear();
pending_transfer_queries_.clear();
while (!queries_.empty()) {
- Query* query = queries_.begin()->second;
+ Query* query = queries_.begin()->second.get();
query->Destroy(have_context);
queries_.erase(queries_.begin());
}
@@ -372,7 +372,7 @@ QueryManager::Query* QueryManager::GetQuery(
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_unittest.cc ('k') | gpu/command_buffer/service/renderbuffer_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698