| Index: content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc
|
| diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc b/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc
|
| index 2fd143894b26f026c94128c0baaf692b7c305284..0747ceae7f69ce0246fa571dc33dffeecdeaf4a2 100644
|
| --- a/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc
|
| +++ b/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc
|
| @@ -7,6 +7,7 @@
|
| #include "base/bind.h"
|
| #include "content/common/gpu/client/gpu_memory_buffer_factory_host.h"
|
| #include "ui/gl/gl_bindings.h"
|
| +#include "ui/ozone/public/surface_factory_ozone.h"
|
|
|
| namespace content {
|
| namespace {
|
| @@ -135,20 +136,14 @@ bool GpuMemoryBufferImplOzoneNativeBuffer::IsUsageSupported(Usage usage) {
|
| case MAP:
|
| return false;
|
| case SCANOUT:
|
| - return true;
|
| + return ui::SurfaceFactoryOzone::GetInstance()->CanCreateNativePixmap(
|
| + ui::SurfaceFactoryOzone::SCANOUT);
|
| }
|
|
|
| NOTREACHED();
|
| return false;
|
| }
|
|
|
| -// static
|
| -bool GpuMemoryBufferImplOzoneNativeBuffer::IsConfigurationSupported(
|
| - Format format,
|
| - Usage usage) {
|
| - return IsFormatSupported(format) && IsUsageSupported(usage);
|
| -}
|
| -
|
| void* GpuMemoryBufferImplOzoneNativeBuffer::Map() {
|
| NOTREACHED();
|
| return NULL;
|
|
|