Merge 79130 - Fix bug in shader and program managers.

gpu/command_buffer/service/program_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_PROGRAM_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_
 
 #include <map>
 #include <string>
 #include <vector>
 #include "base/basictypes.h"
@@ skipping 228 matching lines @@
 
   // 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);
 
+  // Check if a ProgramInfo is owned by this ProgramManager.
+  bool IsOwned(ProgramInfo* info);
+
  private:
   // Info for each "successfully linked" program by service side program Id.
   // TODO(gman): Choose a faster container.
   typedef std::map<GLuint, ProgramInfo::Ref> ProgramInfoMap;
   ProgramInfoMap program_infos_;
 
   void RemoveProgramInfoIfUnused(
       ShaderManager* shader_manager, ProgramInfo* info);
 
   DISALLOW_COPY_AND_ASSIGN(ProgramManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_