diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-27 21:12:35 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-27 21:12:35 +0000 |
| commit | ed9f9cd8516eee1fac01379dc7fd0be4fb63e5c4 (patch) | |
| tree | 7d5d691ebafb18e259bd0f0356c36416d37e30d3 /gpu/command_buffer/service/memory_program_cache_unittest.cc | |
| parent | 31f49d116d1fee7389052b9a524ec668a07dbf69 (diff) | |
| download | chromium_src-ed9f9cd8516eee1fac01379dc7fd0be4fb63e5c4.zip chromium_src-ed9f9cd8516eee1fac01379dc7fd0be4fb63e5c4.tar.gz chromium_src-ed9f9cd8516eee1fac01379dc7fd0be4fb63e5c4.tar.bz2 | |
Refactor/Rename a bunch of GPU stuff
Remove typedef scoped_refptr<Foo> Ref;
FooManager::FooInfo -> Foo
Create/Get/RemoveFooInfo to Create/Get//RemoveFoo
BUG=None
Review URL: https://codereview.chromium.org/12326146
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185036 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service/memory_program_cache_unittest.cc')
| -rw-r--r-- | gpu/command_buffer/service/memory_program_cache_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gpu/command_buffer/service/memory_program_cache_unittest.cc b/gpu/command_buffer/service/memory_program_cache_unittest.cc index 01bae9a..ca24707 100644 --- a/gpu/command_buffer/service/memory_program_cache_unittest.cc +++ b/gpu/command_buffer/service/memory_program_cache_unittest.cc @@ -84,10 +84,10 @@ class MemoryProgramCacheTest : public testing::Test { gl_.reset(new ::testing::StrictMock<gfx::MockGLInterface>()); ::gfx::GLInterface::SetGLInterface(gl_.get()); - vertex_shader_ = shader_manager_.CreateShaderInfo(kVertexShaderClientId, + vertex_shader_ = shader_manager_.CreateShader(kVertexShaderClientId, kVertexShaderServiceId, GL_VERTEX_SHADER); - fragment_shader_ = shader_manager_.CreateShaderInfo( + fragment_shader_ = shader_manager_.CreateShader( kFragmentShaderClientId, kFragmentShaderServiceId, GL_FRAGMENT_SHADER); @@ -168,8 +168,8 @@ class MemoryProgramCacheTest : public testing::Test { scoped_ptr< ::testing::StrictMock<gfx::MockGLInterface> > gl_; scoped_ptr<MemoryProgramCache> cache_; ShaderManager shader_manager_; - ShaderManager::ShaderInfo* vertex_shader_; - ShaderManager::ShaderInfo* fragment_shader_; + Shader* vertex_shader_; + Shader* fragment_shader_; }; TEST_F(MemoryProgramCacheTest, CacheSave) { |