diff options
| author | Primiano Tucci <primiano@google.com> | 2014-09-30 14:45:55 +0100 |
|---|---|---|
| committer | Primiano Tucci <primiano@google.com> | 2014-09-30 14:45:55 +0100 |
| commit | 1320f92c476a1ad9d19dba2a48c72b75566198e9 (patch) | |
| tree | ea7f149ccad687b22c18a72b729646568b2d54fb /content/common/gpu/gpu_memory_buffer_factory_ozone.cc | |
| parent | 39b78c562f50ad7d5551ee861121f899239525a2 (diff) | |
| download | chromium_org-1320f92c476a1ad9d19dba2a48c72b75566198e9.tar.gz | |
Merge from Chromium at DEPS revision 267aeeb8d85c
This commit was generated by merge_to_master.py.
Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
Diffstat (limited to 'content/common/gpu/gpu_memory_buffer_factory_ozone.cc')
| -rw-r--r-- | content/common/gpu/gpu_memory_buffer_factory_ozone.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/common/gpu/gpu_memory_buffer_factory_ozone.cc b/content/common/gpu/gpu_memory_buffer_factory_ozone.cc index ca119e8999..0ec6d34a7c 100644 --- a/content/common/gpu/gpu_memory_buffer_factory_ozone.cc +++ b/content/common/gpu/gpu_memory_buffer_factory_ozone.cc @@ -22,7 +22,7 @@ class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory { unsigned usage) OVERRIDE { switch (handle.type) { case gfx::OZONE_NATIVE_BUFFER: - return ozone_buffer_factory.CreateGpuMemoryBuffer( + return ozone_buffer_factory_.CreateGpuMemoryBuffer( handle.global_id, size, internalformat, usage) ? handle : gfx::GpuMemoryBufferHandle(); @@ -35,7 +35,7 @@ class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory { const gfx::GpuMemoryBufferHandle& handle) OVERRIDE { switch (handle.type) { case gfx::OZONE_NATIVE_BUFFER: - ozone_buffer_factory.DestroyGpuMemoryBuffer(handle.global_id); + ozone_buffer_factory_.DestroyGpuMemoryBuffer(handle.global_id); break; default: NOTREACHED(); @@ -61,7 +61,7 @@ class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory { if (handle.global_id.secondary_id != client_id) return scoped_refptr<gfx::GLImage>(); - return ozone_buffer_factory.CreateImageForGpuMemoryBuffer( + return ozone_buffer_factory_.CreateImageForGpuMemoryBuffer( handle.global_id, size, internalformat); default: NOTREACHED(); @@ -70,7 +70,7 @@ class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory { } private: - ui::GpuMemoryBufferFactoryOzoneNativeBuffer ozone_buffer_factory; + ui::GpuMemoryBufferFactoryOzoneNativeBuffer ozone_buffer_factory_; }; } // namespace |