Make shader and program object lifetimes match OpenGL ES spec....

gpu/command_buffer/service/program_manager.h

Index: gpu/command_buffer/service/program_manager.h
===================================================================
--- gpu/command_buffer/service/program_manager.h	(revision 68425)
+++ gpu/command_buffer/service/program_manager.h	(working copy)
@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 #include "base/basictypes.h"
+#include "base/logging.h"
 #include "base/ref_counted.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/command_buffer/service/shader_manager.h"
@@ -130,8 +131,8 @@
       return valid_;
     }
 
-    bool AttachShader(ShaderManager::ShaderInfo* info);
-    void DetachShader(ShaderManager::ShaderInfo* info);
+    bool AttachShader(ShaderManager* manager, ShaderManager::ShaderInfo* info);
+    void DetachShader(ShaderManager* manager, ShaderManager::ShaderInfo* info);
 
     bool CanLink() const;
 
@@ -143,13 +144,28 @@
       log_info_ = str;
     }
 
+    bool InUse() const {
+      DCHECK_GE(use_count_, 0);
+      return use_count_ != 0;
+    }
+
    private:
     friend class base::RefCounted<ProgramInfo>;
     friend class ProgramManager;
 
     ~ProgramInfo();
 
+    void IncUseCount() {
+      ++use_count_;
+    }
+
+    void DecUseCount() {
+      --use_count_;
+      DCHECK_GE(use_count_, 0);
+    }
+
     void MarkAsDeleted() {
+      DCHECK_NE(service_id_, 0u);
       service_id_ = 0;
     }
 
@@ -160,6 +176,10 @@
         bool use_uniforms, const std::string& name, std::string* corrected_name,
         GLsizei* size, GLenum* type) const;
 
+    void DetachShaders(ShaderManager* manager);
+
+    int use_count_;
+
     GLsizei max_attrib_name_length_;
 
     // Attrib by index.
@@ -204,12 +224,18 @@
   // Gets a program info
   ProgramInfo* GetProgramInfo(GLuint client_id);
 
-  // Deletes the program info for the given program.
-  void RemoveProgramInfo(GLuint client_id);
-
   // Gets a client id for a given service id.
   bool GetClientId(GLuint service_id, GLuint* client_id) const;
 
+  // Marks a program as deleted. If it is not used the info will be deleted.
+  void MarkAsDeleted(ShaderManager* shader_manager, ProgramInfo* info);
+
+  // Marks a program as used.
+  void UseProgram(ProgramInfo* info);
+
+  // Makes a program as unused. If deleted the program info will be removed.
+  void UnuseProgram(ShaderManager* shader_manager, ProgramInfo* info);
+
   // Returns true if prefix is invalid for gl.
   static bool IsInvalidPrefix(const char* name, size_t length);
 
@@ -219,6 +245,9 @@
   typedef std::map<GLuint, ProgramInfo::Ref> ProgramInfoMap;
   ProgramInfoMap program_infos_;
 
+  void RemoveProgramInfoIfUnused(
+      ShaderManager* shader_manager, ProgramInfo* info);
+
   DISALLOW_COPY_AND_ASSIGN(ProgramManager);
 };