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

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

Issue 17948002: Update Linux 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, 6 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/vertex_array_manager.cc
diff --git a/gpu/command_buffer/service/vertex_array_manager.cc b/gpu/command_buffer/service/vertex_array_manager.cc
index 3b94fa72ba8f24983fa2958ee49f6ee85bcf3f44..974751941ce4a41fdbcc5efe596560db1995bed5 100644
--- a/gpu/command_buffer/service/vertex_array_manager.cc
+++ b/gpu/command_buffer/service/vertex_array_manager.cc
@@ -41,7 +41,7 @@ void VertexArrayManager::CreateVertexAttribManager(
VertexAttribManager* VertexArrayManager::GetVertexAttribManager(
GLuint client_id) {
VertexAttribManagerMap::iterator it = vertex_attrib_managers_.find(client_id);
- return it != vertex_attrib_managers_.end() ? it->second : NULL;
+ return it != vertex_attrib_managers_.end() ? it->second.get() : NULL;
}
void VertexArrayManager::RemoveVertexAttribManager(GLuint client_id) {
« no previous file with comments | « gpu/command_buffer/service/texture_manager.cc ('k') | gpu/command_buffer/tests/gl_gpu_memory_buffer_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698