Chromium Code Reviews| Index: ui/ozone/platform/drm/client_native_pixmap_factory_gbm.cc |
| diff --git a/ui/ozone/platform/drm/client_native_pixmap_factory_gbm.cc b/ui/ozone/platform/drm/client_native_pixmap_factory_gbm.cc |
| index 284b50b7978ddb611a055bd2b5b61095f268cca5..4d7e1334b8f293dd04df002c3765cbad4da1b116 100644 |
| --- a/ui/ozone/platform/drm/client_native_pixmap_factory_gbm.cc |
| +++ b/ui/ozone/platform/drm/client_native_pixmap_factory_gbm.cc |
| @@ -47,7 +47,11 @@ class ClientNativePixmapFactoryGbm : public ClientNativePixmapFactory { |
| format == gfx::BufferFormat::BGRX_8888; |
| case gfx::BufferUsage::GPU_READ_CPU_READ_WRITE: |
| case gfx::BufferUsage::GPU_READ_CPU_READ_WRITE_PERSISTENT: { |
| +#if defined(OS_CHROMEOS) |
| return format == gfx::BufferFormat::BGRA_8888; |
| +#else |
| + return false; |
| +#endif |
| } |
| } |
| NOTREACHED(); |
| @@ -62,8 +66,12 @@ class ClientNativePixmapFactoryGbm : public ClientNativePixmapFactory { |
| switch (usage) { |
| case gfx::BufferUsage::GPU_READ_CPU_READ_WRITE: |
| case gfx::BufferUsage::GPU_READ_CPU_READ_WRITE_PERSISTENT: |
| +#if defined(OS_CHROMEOS) |
| return ClientNativePixmapDmaBuf::ImportFromDmabuf( |
| - scoped_fd.get(), size, handle.stride); |
| + scoped_fd.release(), size, handle.stride); |
| +#else |
| + return nullptr; |
|
spang
2016/03/30 21:03:24
NOTREACHED()
vignatti (out of this project)
2016/03/30 21:13:56
Done.
spang
2016/03/30 21:20:01
You forgot the semicolon.
|
| +#endif |
| case gfx::BufferUsage::GPU_READ: |
| case gfx::BufferUsage::SCANOUT: |
| return make_scoped_ptr<ClientNativePixmapGbm>( |