Merge 79130 - Fix bug in shader and program managers.

gpu/command_buffer/service/shader_manager_unittest.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/shader_manager.h"
 
 #include "base/scoped_ptr.h"
 #include "gpu/command_buffer/common/gl_mock.h"
 #include "gpu/command_buffer/service/mocks.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 56 matching lines @@
   ASSERT_TRUE(info1 != NULL);
   EXPECT_CALL(*gl_, DeleteShader(kService1Id))
       .Times(1)
       .RetiresOnSaturation();
   manager_.Destroy(true);
   // Check that resources got freed.
   info1 = manager_.GetShaderInfo(kClient1Id);
   ASSERT_TRUE(info1 == NULL);
 }
 
+TEST_F(ShaderManagerTest, DeleteBug) {
+  const GLuint kClient1Id = 1;
+  const GLuint kClient2Id = 2;
+  const GLuint kService1Id = 11;
+  const GLuint kService2Id = 12;
+  const GLenum kShaderType = GL_VERTEX_SHADER;
+  // Check we can create shader.
+  manager_.CreateShaderInfo(kClient1Id, kService1Id, kShaderType);
+  manager_.CreateShaderInfo(kClient2Id, kService2Id, kShaderType);
+  ShaderManager::ShaderInfo::Ref info1(manager_.GetShaderInfo(kClient1Id));
+  ShaderManager::ShaderInfo::Ref info2(manager_.GetShaderInfo(kClient2Id));
+  ASSERT_TRUE(info1.get() != NULL);
+  ASSERT_TRUE(info2.get() != NULL);
+  manager_.UseShader(info1);
+  manager_.MarkAsDeleted(info1);
+  manager_.MarkAsDeleted(info2);
+  EXPECT_TRUE(manager_.IsOwned(info1));
+  EXPECT_FALSE(manager_.IsOwned(info2));
+}
+
 TEST_F(ShaderManagerTest, ShaderInfo) {
   const GLuint kClient1Id = 1;
   const GLuint kService1Id = 11;
   const GLenum kShader1Type = GL_VERTEX_SHADER;
   const char* kClient1Source = "hello world";
   // Check we can create shader.
   manager_.CreateShaderInfo(kClient1Id, kService1Id, kShader1Type);
   // Check shader got created.
   ShaderManager::ShaderInfo* info1 = manager_.GetShaderInfo(kClient1Id);
   ASSERT_TRUE(info1 != NULL);
@@ skipping 125 matching lines @@
   EXPECT_EQ(info1, info2);
   manager_.MarkAsDeleted(info1);  // this should delete the shader.
   info2 = manager_.GetShaderInfo(kClient1Id);
   EXPECT_TRUE(info2 == NULL);
 }
 
 }  // namespace gles2
 }  // namespace gpu