Merge 79130 - Fix bug in shader and program managers.

gpu/command_buffer/service/shader_manager.h

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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"
 #include "base/logging.h"
@@ skipping 59 matching lines @@
       DCHECK_GE(use_count_, 0);
       return use_count_ != 0;
     }
 
    private:
     typedef ShaderTranslator::VariableMap VariableMap;
 
     friend class base::RefCounted<ShaderInfo>;
     friend class ShaderManager;
 
-    ShaderInfo(GLuint service_id, GLenum shader_type)
-        : use_count_(0),
-          service_id_(service_id),
-          shader_type_(shader_type),
-          valid_(false) {
-    }
+    ShaderInfo(GLuint service_id, GLenum shader_type);
+    ~ShaderInfo();
 
-    ~ShaderInfo() { }
-
-    void IncUseCount() {
-      ++use_count_;
-    }
-
-    void DecUseCount() {
-      --use_count_;
-      DCHECK_GE(use_count_, 0);
-    }
-
-    void MarkAsDeleted() {
-      DCHECK_NE(service_id_, 0u);
-      service_id_ = 0;
-    }
+    void IncUseCount();
+    void DecUseCount();
+    void MarkAsDeleted();
 
     int use_count_;
 
     // The shader this ShaderInfo is tracking.
     GLuint service_id_;
     // Type of shader - GL_VERTEX_SHADER or GL_FRAGMENT_SHADER.
     GLenum shader_type_;
 
     // True if compilation succeeded.
     bool valid_;
@@ skipping 29 matching lines @@
 
   void MarkAsDeleted(ShaderInfo* info);
 
   // Mark a shader as used
   void UseShader(ShaderInfo* info);
 
   // Unmark a shader as used. If it has been deleted and is not used
   // then we free the info.
   void UnuseShader(ShaderInfo* info);
 
+  // Check if a ShaderInfo is owned by this ShaderManager.
+  bool IsOwned(ShaderInfo* info);
+
  private:
   // Info for each shader by service side shader Id.
   typedef std::map<GLuint, ShaderInfo::Ref> ShaderInfoMap;
   ShaderInfoMap shader_infos_;
 
   void RemoveShaderInfoIfUnused(ShaderInfo* info);
 
   DISALLOW_COPY_AND_ASSIGN(ShaderManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_SHADER_MANAGER_H_