Merge 79130 - Fix bug in shader and program managers.

gpu/command_buffer/service/program_manager.cc

-// 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.
 
 #include "gpu/command_buffer/service/program_manager.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
@@ skipping 435 matching lines @@
   for (ProgramInfoMap::const_iterator it = program_infos_.begin();
        it != program_infos_.end(); ++it) {
     if (it->second->service_id() == service_id) {
       *client_id = it->first;
       return true;
     }
   }
   return false;
 }
 
+bool ProgramManager::IsOwned(ProgramManager::ProgramInfo* info) {
+  for (ProgramInfoMap::iterator it = program_infos_.begin();
+       it != program_infos_.end(); ++it) {
+    if (it->second.get() == info) {
+      return true;
+    }
+  }
+  return false;
+}
+
 void ProgramManager::RemoveProgramInfoIfUnused(
     ShaderManager* shader_manager, ProgramInfo* info) {
   DCHECK(shader_manager);
   DCHECK(info);
+  DCHECK(IsOwned(info));
   if (info->IsDeleted() && !info->InUse()) {
     info->DetachShaders(shader_manager);
     for (ProgramInfoMap::iterator it = program_infos_.begin();
          it != program_infos_.end(); ++it) {
-      if (it->second->service_id() == info->service_id()) {
+      if (it->second.get() == info) {
         program_infos_.erase(it);
         return;
       }
     }
     NOTREACHED();
   }
 }
 
 void ProgramManager::MarkAsDeleted(
     ShaderManager* shader_manager,
     ProgramManager::ProgramInfo* info) {
   DCHECK(shader_manager);
   DCHECK(info);
+  DCHECK(IsOwned(info));
   info->MarkAsDeleted();
   RemoveProgramInfoIfUnused(shader_manager, info);
 }
 
 void ProgramManager::UseProgram(ProgramManager::ProgramInfo* info) {
   DCHECK(info);
+  DCHECK(IsOwned(info));
   info->IncUseCount();
 }
 
 void ProgramManager::UnuseProgram(
     ShaderManager* shader_manager,
     ProgramManager::ProgramInfo* info) {
   DCHECK(shader_manager);
   DCHECK(info);
+  DCHECK(IsOwned(info));
   info->DecUseCount();
   RemoveProgramInfoIfUnused(shader_manager, info);
 }
 
 }  // namespace gles2
 }  // namespace gpu