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

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

Issue 1136006: Calling OpenGL from the renderer process. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 9 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/texture_manager.h ('k') | gpu/demos/framework/window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/texture_manager.cc
===================================================================
--- gpu/command_buffer/service/texture_manager.cc (revision 42644)
+++ gpu/command_buffer/service/texture_manager.cc (working copy)
@@ -265,12 +265,13 @@
max_cube_map_texture_size)) {
}
-void TextureManager::CreateTextureInfo(GLuint texture_id) {
+TextureManager::TextureInfo* TextureManager::CreateTextureInfo(
+ GLuint texture_id) {
+ TextureInfo::Ref info(new TextureInfo(texture_id));
std::pair<TextureInfoMap::iterator, bool> result =
- texture_infos_.insert(
- std::make_pair(texture_id,
- TextureInfo::Ref(new TextureInfo(texture_id))));
+ texture_infos_.insert(std::make_pair(texture_id, info));
DCHECK(result.second);
+ return info.get();
}
TextureManager::TextureInfo* TextureManager::GetTextureInfo(
« no previous file with comments | « gpu/command_buffer/service/texture_manager.h ('k') | gpu/demos/framework/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698