| Index: gpu/ipc/common/gpu_memory_buffer_support.cc
|
| diff --git a/gpu/ipc/common/gpu_memory_buffer_support.cc b/gpu/ipc/common/gpu_memory_buffer_support.cc
|
| index ff151805c92ad3676005b79468ef646fdcdaec8d..64412459f3b269c0587f8218267da4628fee6e85 100644
|
| --- a/gpu/ipc/common/gpu_memory_buffer_support.cc
|
| +++ b/gpu/ipc/common/gpu_memory_buffer_support.cc
|
| @@ -17,9 +17,6 @@ gfx::GpuMemoryBufferType GetNativeGpuMemoryBufferType() {
|
| #if defined(OS_MACOSX)
|
| return gfx::IO_SURFACE_BUFFER;
|
| #endif
|
| -#if defined(OS_ANDROID)
|
| - return gfx::SURFACE_TEXTURE_BUFFER;
|
| -#endif
|
| #if defined(USE_OZONE)
|
| return gfx::OZONE_NATIVE_PIXMAP;
|
| #endif
|
| @@ -48,19 +45,6 @@ bool IsNativeGpuMemoryBufferConfigurationSupported(gfx::BufferFormat format,
|
| return false;
|
| #endif
|
|
|
| -#if defined(OS_ANDROID)
|
| - switch (usage) {
|
| - case gfx::BufferUsage::GPU_READ:
|
| - case gfx::BufferUsage::SCANOUT:
|
| - case gfx::BufferUsage::GPU_READ_CPU_READ_WRITE_PERSISTENT:
|
| - return false;
|
| - case gfx::BufferUsage::GPU_READ_CPU_READ_WRITE:
|
| - return format == gfx::BufferFormat::RGBA_8888;
|
| - }
|
| - NOTREACHED();
|
| - return false;
|
| -#endif
|
| -
|
| #if defined(USE_OZONE)
|
| if (!ui::ClientNativePixmapFactory::GetInstance()) {
|
| // unittests don't have to set ClientNativePixmapFactory.
|
|
|