diff options
| author | reveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-31 16:42:43 +0000 |
|---|---|---|
| committer | reveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-31 16:42:43 +0000 |
| commit | aa62fad16f145408f9098ec678202299d40b01e9 (patch) | |
| tree | a6699c4a651ff3e2e7a94166e5f4eb8b49efe24a /gpu | |
| parent | 149a5a7ba487d2af5effae300c8e6785060fbfc4 (diff) | |
| download | chromium_src-aa62fad16f145408f9098ec678202299d40b01e9.zip chromium_src-aa62fad16f145408f9098ec678202299d40b01e9.tar.gz chromium_src-aa62fad16f145408f9098ec678202299d40b01e9.tar.bz2 | |
ui: Cleanup gfx::GpuMemoryBuffer interface.
Fix description of interface and improve the comments in general.
Clang format all *gpu_memory_buffer* files.
This also make the interface a bit easier to use by not having Map()
unnecessarily use a parameter for return value.
Also add myself to ui/gfx/OWNERS and content/common/gpu/OWNERS
BUG=
Review URL: https://codereview.chromium.org/216333004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260566 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/client/gles2_implementation.cc | 4 | ||||
| -rw-r--r-- | gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc index 0dd5161..c155af5 100644 --- a/gpu/command_buffer/client/gles2_implementation.cc +++ b/gpu/command_buffer/client/gles2_implementation.cc @@ -4003,9 +4003,7 @@ void* GLES2Implementation::MapImageCHROMIUMHelper(GLuint image_id, return NULL; } - void* mapped_buffer = NULL; - gpu_buffer->Map(mode, &mapped_buffer); - return mapped_buffer; + return gpu_buffer->Map(mode); } void* GLES2Implementation::MapImageCHROMIUM( diff --git a/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc b/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc index 95ae958..5948d76 100644 --- a/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc +++ b/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc @@ -42,7 +42,7 @@ class MockGpuMemoryBuffer : public gfx::GpuMemoryBuffer { Die(); } - MOCK_METHOD2(Map, void(gfx::GpuMemoryBuffer::AccessMode, void**)); + MOCK_METHOD1(Map, void*(gfx::GpuMemoryBuffer::AccessMode)); MOCK_METHOD0(Unmap, void()); MOCK_CONST_METHOD0(IsMapped, bool()); MOCK_CONST_METHOD0(GetStride, uint32()); @@ -149,9 +149,9 @@ TEST_F(MockGpuMemoryBufferTest, Lifecycle) { shared_memory.Map(bytes); EXPECT_TRUE(shared_memory.memory()); - EXPECT_CALL(*gpu_memory_buffer, Map(_, _)) + EXPECT_CALL(*gpu_memory_buffer, Map(gfx::GpuMemoryBuffer::READ_WRITE)) .Times(1) - .WillOnce(SetArgPointee<1>(shared_memory.memory())) + .WillOnce(Return(shared_memory.memory())) .RetiresOnSaturation(); uint8* mapped_buffer = static_cast<uint8*>( glMapImageCHROMIUM(image_id, GL_READ_WRITE)); |