Changes the code to use separate ids namspaces...

gpu/command_buffer/service/shader_manager.h

 // 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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_SHADER_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_SHADER_MANAGER_H_
 
 #include <map>
 #include <string>
 #include "base/basictypes.h"
@@ skipping 10 matching lines @@
 class ShaderManager {
  public:
   // This is used to keep the source code for a shader. This is because in order
   // to emluate GLES2 the shaders will have to be re-written before passed to
   // the underlying OpenGL. But, when the user calls glGetShaderSource they
   // should get the source they passed in, not the re-written source.
   class ShaderInfo : public base::RefCounted<ShaderInfo> {
    public:
     typedef scoped_refptr<ShaderInfo> Ref;
 
-    explicit ShaderInfo(GLuint shader_id)
-        : shader_id_(shader_id) {
+    explicit ShaderInfo(GLuint service_id)
+        : service_id_(service_id) {
     }
 
     void Update(const std::string& source) {
       source_ = source;
     }
 
+    GLuint service_id() const {
+      return service_id_;
+    }
+
     const std::string& source() {
       return source_;
     }
 
     bool IsDeleted() {
-      return shader_id_ == 0;
+      return service_id_ == 0;
     }
 
    private:
     friend class base::RefCounted<ShaderInfo>;
     friend class ShaderManager;
     ~ShaderInfo() { }
 
     void MarkAsDeleted() {
-      shader_id_ = 0;
+      service_id_ = 0;
     }
 
     // The shader this ShaderInfo is tracking.
-    GLuint shader_id_;
+    GLuint service_id_;
 
     // The shader source as passed to glShaderSource.
     std::string source_;
   };
 
   ShaderManager() {
   }
 
   // Creates a shader info for the given shader ID.
-  void CreateShaderInfo(GLuint shader_id);
+  void CreateShaderInfo(GLuint client_id, GLuint service_id);
 
   // Gets an existing shader info for the given shader ID. Returns NULL if none
   // exists.
-  ShaderInfo* GetShaderInfo(GLuint shader_id);
+  ShaderInfo* GetShaderInfo(GLuint client_id);
 
   // Deletes the shader info for the given shader.
-  void RemoveShaderInfo(GLuint shader_id);
+  void RemoveShaderInfo(GLuint client_id);
+
+  // Gets a client id for a given service id.
+  bool GetClientId(GLuint service_id, GLuint* client_id) const;
 
  private:
   // Info for each shader by service side shader Id.
   typedef std::map<GLuint, ShaderInfo::Ref> ShaderInfoMap;
   ShaderInfoMap shader_infos_;
 
   DISALLOW_COPY_AND_ASSIGN(ShaderManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_SHADER_MANAGER_H_