Index: content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc |
diff --git a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc b/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc |
index dfc0e38ee0b4b1c8518c922f1289fd658c00fc6a..0b0f0d92cbe78b5c1fdc28bc7d583e59fdfb4124 100644 |
--- a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc |
+++ b/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc |
@@ -6,16 +6,58 @@ |
#include "base/logging.h" |
#include "ui/gl/gl_image.h" |
-#include "ui/ozone/public/ozone_platform.h" |
-#include "ui/ozone/public/surface_factory_ozone.h" |
+#include "ui/ozone/public/native_pixmap_manager.h" |
namespace content { |
namespace { |
-const GpuMemoryBufferFactory::Configuration kSupportedConfigurations[] = { |
- { gfx::GpuMemoryBuffer::BGRA_8888, gfx::GpuMemoryBuffer::SCANOUT }, |
- { gfx::GpuMemoryBuffer::RGBX_8888, gfx::GpuMemoryBuffer::SCANOUT } |
-}; |
+gfx::GpuMemoryBuffer::Format FormatFromOzoneBufferFormat( |
+ ui::SurfaceFactoryOzone::BufferFormat ozone_format) { |
+ switch (ozone_format) { |
+ case ui::SurfaceFactoryOzone::BGRA_8888: |
+ return gfx::GpuMemoryBuffer::BGRA_8888; |
+ case ui::SurfaceFactoryOzone::RGBX_8888: |
+ return gfx::GpuMemoryBuffer::RGBX_8888; |
+ case ui::SurfaceFactoryOzone::UNKNOWN: |
+ NOTREACHED(); |
+ break; |
+ } |
+ NOTREACHED(); |
+ return gfx::GpuMemoryBuffer::BGRA_8888; |
+} |
+ |
+gfx::GpuMemoryBuffer::Usage UsageFromOzoneBufferUsage( |
+ ui::SurfaceFactoryOzone::BufferUsage ozone_usage) { |
+ switch (ozone_usage) { |
+ case ui::SurfaceFactoryOzone::MAP: |
+ return gfx::GpuMemoryBuffer::MAP; |
+ case ui::SurfaceFactoryOzone::PERSISTENT_MAP: |
+ return gfx::GpuMemoryBuffer::PERSISTENT_MAP; |
+ case ui::SurfaceFactoryOzone::SCANOUT: |
+ return gfx::GpuMemoryBuffer::SCANOUT; |
+ } |
+ NOTREACHED(); |
+ return gfx::GpuMemoryBuffer::MAP; |
+} |
+ |
+void ConvertConfigurations( |
+ const std::vector<ui::NativePixmapManager::Configuration>& |
+ ozone_configurations, |
+ std::vector<GpuMemoryBufferFactory::Configuration>* configurations) { |
+ for (auto& ozone_conf : ozone_configurations) { |
+ configurations->push_back({FormatFromOzoneBufferFormat(ozone_conf.format), |
+ UsageFromOzoneBufferUsage(ozone_conf.usage)}); |
+ } |
+} |
+ |
+void GetSupportedConfigurations( |
+ std::vector<GpuMemoryBufferFactory::Configuration>* configurations) { |
+ DCHECK(ui::NativePixmapManager::GetInstance()); |
+ std::vector<ui::NativePixmapManager::Configuration> ozone_configurations = |
+ ui::NativePixmapManager::GetInstance() |
+ ->GetSupportedNativePixmapConfigurations(); |
+ ConvertConfigurations(ozone_configurations, configurations); |
+} |
} // namespace |
@@ -31,7 +73,9 @@ GpuMemoryBufferFactoryOzoneNativeBuffer:: |
bool GpuMemoryBufferFactoryOzoneNativeBuffer:: |
IsGpuMemoryBufferConfigurationSupported(gfx::GpuMemoryBuffer::Format format, |
gfx::GpuMemoryBuffer::Usage usage) { |
- for (auto& configuration : kSupportedConfigurations) { |
+ std::vector<Configuration> configurations; |
+ GetSupportedConfigurations(&configurations); |
+ for (auto& configuration : configurations) { |
if (configuration.format == format && configuration.usage == usage) |
return true; |
} |
@@ -42,14 +86,7 @@ bool GpuMemoryBufferFactoryOzoneNativeBuffer:: |
void GpuMemoryBufferFactoryOzoneNativeBuffer:: |
GetSupportedGpuMemoryBufferConfigurations( |
std::vector<Configuration>* configurations) { |
- if (!ui::OzonePlatform::GetInstance() |
- ->GetSurfaceFactoryOzone() |
- ->CanCreateNativePixmap(ui::SurfaceFactoryOzone::SCANOUT)) |
- return; |
- |
- configurations->assign( |
- kSupportedConfigurations, |
- kSupportedConfigurations + arraysize(kSupportedConfigurations)); |
+ GetSupportedConfigurations(configurations); |
} |
gfx::GpuMemoryBufferHandle |