| Index: content/common/gpu/gpu_memory_buffer_factory_surface_texture.cc
|
| diff --git a/content/common/gpu/gpu_memory_buffer_factory_surface_texture.cc b/content/common/gpu/gpu_memory_buffer_factory_surface_texture.cc
|
| index 490c45e41f03d1376a347efa715027d79d0ea917..3648817d68ead29f1c4b535e33c23662344054df 100644
|
| --- a/content/common/gpu/gpu_memory_buffer_factory_surface_texture.cc
|
| +++ b/content/common/gpu/gpu_memory_buffer_factory_surface_texture.cc
|
| @@ -9,12 +9,6 @@
|
| #include "ui/gl/gl_image_surface_texture.h"
|
|
|
| namespace content {
|
| -namespace {
|
| -
|
| -const GpuMemoryBufferFactory::Configuration kSupportedConfigurations[] = {
|
| - {gfx::BufferFormat::RGBA_8888, gfx::BufferUsage::MAP}};
|
| -
|
| -} // namespace
|
|
|
| GpuMemoryBufferFactorySurfaceTexture::GpuMemoryBufferFactorySurfaceTexture() {
|
| }
|
| @@ -26,22 +20,17 @@ GpuMemoryBufferFactorySurfaceTexture::~GpuMemoryBufferFactorySurfaceTexture() {
|
| bool GpuMemoryBufferFactorySurfaceTexture::
|
| IsGpuMemoryBufferConfigurationSupported(gfx::BufferFormat format,
|
| gfx::BufferUsage usage) {
|
| - for (auto& configuration : kSupportedConfigurations) {
|
| - if (configuration.format == format && configuration.usage == usage)
|
| - return true;
|
| + switch (usage) {
|
| + case gfx::BufferUsage::SCANOUT:
|
| + case gfx::BufferUsage::PERSISTENT_MAP:
|
| + return false;
|
| + case gfx::BufferUsage::MAP:
|
| + return format == gfx::BufferFormat::RGBA_8888;
|
| }
|
| -
|
| + NOTREACHED();
|
| return false;
|
| }
|
|
|
| -void GpuMemoryBufferFactorySurfaceTexture::
|
| - GetSupportedGpuMemoryBufferConfigurations(
|
| - std::vector<Configuration>* configurations) {
|
| - configurations->assign(
|
| - kSupportedConfigurations,
|
| - kSupportedConfigurations + arraysize(kSupportedConfigurations));
|
| -}
|
| -
|
| gfx::GpuMemoryBufferHandle
|
| GpuMemoryBufferFactorySurfaceTexture::CreateGpuMemoryBuffer(
|
| gfx::GpuMemoryBufferId id,
|
|
|