Changes the code to use separate ids namspaces...

gpu/command_buffer/service/buffer_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/buffer_manager.h"
 #include "base/logging.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 namespace gpu {
 namespace gles2 {
 
-void BufferManager::CreateBufferInfo(GLuint buffer_id) {
+void BufferManager::CreateBufferInfo(GLuint client_id, GLuint service_id) {
   std::pair<BufferInfoMap::iterator, bool> result =
       buffer_infos_.insert(
-          std::make_pair(buffer_id,
-                         BufferInfo::Ref(new BufferInfo(buffer_id))));
+          std::make_pair(client_id,
+                         BufferInfo::Ref(new BufferInfo(service_id))));
   DCHECK(result.second);
 }
 
 BufferManager::BufferInfo* BufferManager::GetBufferInfo(
-    GLuint buffer_id) {
-  BufferInfoMap::iterator it = buffer_infos_.find(buffer_id);
+    GLuint client_id) {
+  BufferInfoMap::iterator it = buffer_infos_.find(client_id);
   return it != buffer_infos_.end() ? it->second : NULL;
 }
 
-void BufferManager::RemoveBufferInfo(GLuint buffer_id) {
-  BufferInfoMap::iterator it = buffer_infos_.find(buffer_id);
+void BufferManager::RemoveBufferInfo(GLuint client_id) {
+  BufferInfoMap::iterator it = buffer_infos_.find(client_id);
   if (it != buffer_infos_.end()) {
     it->second->MarkAsDeleted();
-    buffer_infos_.erase(buffer_id);
+    buffer_infos_.erase(it);
   }
 }
 
 void BufferManager::BufferInfo::SetSize(GLsizeiptr size) {
   DCHECK(!IsDeleted());
   if (size != size_) {
     size_ = size;
     ClearCache();
     if (target_ == GL_ELEMENT_ARRAY_BUFFER) {
       shadow_.reset(new int8[size]);
@@ skipping 79 matching lines @@
   std::pair<RangeToMaxValueMap::iterator, bool> result =
       range_set_.insert(std::make_pair(range, max_v));
   *max_value = max_v;
   return true;
 }
 
 }  // namespace gles2
 }  // namespace gpu