Bug fixes for getTranslatedShader

gpu/command_buffer/service/program_manager_unittest.cc

 // Copyright (c) 2012 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/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
@@ skipping 1359 matching lines @@
 
   ProgramManager::ProgramInfo* program_info = manager_.CreateProgramInfo(
       kNewProgramClientId, kNewProgramServiceId);
   ASSERT_TRUE(program_info != NULL);
   program_info->AttachShader(&shader_manager_, new_vertex_shader);
   program_info->AttachShader(&shader_manager_, fragment_shader_);
 
   SetExpectationsForNoCompile(new_vertex_shader);
 
   manager_.DoCompileShader(new_vertex_shader, NULL, NULL);
+  EXPECT_EQ(ShaderManager::ShaderInfo::PENDING_DEFERRED_COMPILE,
+              new_vertex_shader->compilation_status());

[greggman, 2012/07/23 22:13:03]

style: indent

[dmurph, 2012/07/23 22:18:58]

Done.

 
   new_vertex_shader->UpdateSource("different!");
   EXPECT_EQ(original_source,
             *new_vertex_shader->deferred_compilation_source());
 
-  EXPECT_FALSE(new_vertex_shader->source_compiled());
-  EXPECT_FALSE(fragment_shader_->source_compiled());
+  EXPECT_EQ(ShaderManager::ShaderInfo::PENDING_DEFERRED_COMPILE,
+            new_vertex_shader->compilation_status());
+  EXPECT_EQ(ShaderManager::ShaderInfo::PENDING_DEFERRED_COMPILE,
+            fragment_shader_->compilation_status());
 
   SetExpectationsForNoCompile(fragment_shader_);
   SetExpectationsForNotCachingProgram(program_info,
                                       new_vertex_shader,
                                       fragment_shader_);
   SetExpectationsForProgramLoad(kNewProgramServiceId,
                                 program_info,
                                 new_vertex_shader,
                                 fragment_shader_,
                                 ProgramCache::PROGRAM_LOAD_SUCCESS);
@@ skipping 31 matching lines @@
 
   const std::string differentSource = "different!";
   new_vertex_shader->UpdateSource(differentSource.c_str());
   SetExpectationsForSuccessCompile(new_vertex_shader);
 
   FeatureInfo::Ref info(new FeatureInfo());
   manager_.DoCompileShader(new_vertex_shader, NULL, info.get());
   EXPECT_EQ(differentSource,
             *new_vertex_shader->deferred_compilation_source());
 
-  EXPECT_TRUE(new_vertex_shader->source_compiled());
-  EXPECT_FALSE(fragment_shader_->source_compiled());
+  EXPECT_EQ(ShaderManager::ShaderInfo::COMPILED,
+            new_vertex_shader->compilation_status());
+  EXPECT_EQ(ShaderManager::ShaderInfo::PENDING_DEFERRED_COMPILE,
+            fragment_shader_->compilation_status());
 
   // so we don't recompile because we were pending originally
   SetExpectationsForNoCompile(new_vertex_shader);
   SetExpectationsForSuccessCompile(fragment_shader_);
   SetExpectationsForProgramCached(program_info,
                                   new_vertex_shader,
                                   fragment_shader_);
   SetExpectationsForProgramLink(kNewProgramServiceId);
 
   EXPECT_TRUE(program_info->Link(&shader_manager_, NULL, NULL, info.get()));
 }
 
 }  // namespace gles2
 }  // namespace gpu