Changes the code to use separate ids namspaces...

gpu/command_buffer/service/texture_manager.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "base/bits.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
@@ skipping 260 matching lines @@
   default_texture_cube_map_ = TextureInfo::Ref(new TextureInfo(0));
   SetInfoTarget(default_texture_cube_map_, GL_TEXTURE_CUBE_MAP);
   for (int ii = 0; ii < GLES2Util::kNumFaces; ++ii) {
     default_texture_cube_map_->SetLevelInfo(
       GLES2Util::IndexToGLFaceTarget(ii),
       0, GL_RGBA, 1, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE);
   }
 }
 
 TextureManager::TextureInfo* TextureManager::CreateTextureInfo(
-    GLuint texture_id) {
-  TextureInfo::Ref info(new TextureInfo(texture_id));
+    GLuint client_id, GLuint service_id) {
+  TextureInfo::Ref info(new TextureInfo(service_id));
   std::pair<TextureInfoMap::iterator, bool> result =
-      texture_infos_.insert(std::make_pair(texture_id, info));
+      texture_infos_.insert(std::make_pair(client_id, info));
   DCHECK(result.second);
   return info.get();
 }
 
 TextureManager::TextureInfo* TextureManager::GetTextureInfo(
-    GLuint texture_id) {
-  TextureInfoMap::iterator it = texture_infos_.find(texture_id);
+    GLuint client_id) {
+  TextureInfoMap::iterator it = texture_infos_.find(client_id);
   return it != texture_infos_.end() ? it->second : NULL;
 }
 
-void TextureManager::RemoveTextureInfo(GLuint texture_id) {
-  TextureInfoMap::iterator it = texture_infos_.find(texture_id);
+void TextureManager::RemoveTextureInfo(GLuint client_id) {
+  TextureInfoMap::iterator it = texture_infos_.find(client_id);
   if (it != texture_infos_.end()) {
     it->second->MarkAsDeleted();
-    texture_infos_.erase(texture_id);
+    texture_infos_.erase(it);
   }
 }
 
+bool TextureManager::GetClientId(GLuint service_id, GLuint* client_id) const {
+  // This doesn't need to be fast. It's only used during slow queries.
+  for (TextureInfoMap::const_iterator it = texture_infos_.begin();
+       it != texture_infos_.end(); ++it) {
+    if (it->second->service_id() == service_id) {
+      *client_id = it->first;
+      return true;
+    }
+  }
+  return false;
+}
+
 }  // namespace gles2
 }  // namespace gpu