| Index: content/common/gpu/client/gpu_memory_buffer_impl.cc
|
| diff --git a/content/common/gpu/client/gpu_memory_buffer_impl.cc b/content/common/gpu/client/gpu_memory_buffer_impl.cc
|
| index 928faa9df36578d5cf828c2b6b1a1d9dacf2de37..cc0ac0044ac2997e2a9d6782d171e202a8ea4ad0 100644
|
| --- a/content/common/gpu/client/gpu_memory_buffer_impl.cc
|
| +++ b/content/common/gpu/client/gpu_memory_buffer_impl.cc
|
| @@ -78,28 +78,6 @@ GpuMemoryBufferImpl* GpuMemoryBufferImpl::FromClientBuffer(
|
| }
|
|
|
| // static
|
| -size_t GpuMemoryBufferImpl::NumberOfPlanesForGpuMemoryBufferFormat(
|
| - gfx::BufferFormat format) {
|
| - switch (format) {
|
| - case gfx::BufferFormat::ATC:
|
| - case gfx::BufferFormat::ATCIA:
|
| - case gfx::BufferFormat::DXT1:
|
| - case gfx::BufferFormat::DXT5:
|
| - case gfx::BufferFormat::ETC1:
|
| - case gfx::BufferFormat::R_8:
|
| - case gfx::BufferFormat::RGBA_4444:
|
| - case gfx::BufferFormat::RGBA_8888:
|
| - case gfx::BufferFormat::RGBX_8888:
|
| - case gfx::BufferFormat::BGRA_8888:
|
| - return 1;
|
| - case gfx::BufferFormat::YUV_420:
|
| - return 3;
|
| - }
|
| - NOTREACHED();
|
| - return 0;
|
| -}
|
| -
|
| -// static
|
| size_t GpuMemoryBufferImpl::SubsamplingFactor(gfx::BufferFormat format,
|
| int plane) {
|
| switch (format) {
|
| @@ -176,7 +154,7 @@ bool GpuMemoryBufferImpl::BufferSizeInBytes(const gfx::Size& size,
|
| gfx::BufferFormat format,
|
| size_t* size_in_bytes) {
|
| base::CheckedNumeric<size_t> checked_size = 0;
|
| - size_t num_planes = NumberOfPlanesForGpuMemoryBufferFormat(format);
|
| + size_t num_planes = gfx::GpuMemoryBuffer::NumberOfPlanes(format);
|
| for (size_t i = 0; i < num_planes; ++i) {
|
| size_t row_size_in_bytes = 0;
|
| if (!RowSizeInBytes(size.width(), format, i, &row_size_in_bytes))
|
|
|