Unify graphics buffer enums for GpuMemoryBuffer & SurfaceFactoryOzone
This moves the gfx::GpuMemoryBuffer::BufferFormat to gfx::BufferFormat
and moves gfx::GpuMemoryBuffer:BufferUsage to gfx::BufferUsage, and
removes the ozone versions in favor of a common type. This avoids
unnecessary conversions.
There should be no functional change.
BUG=none
TEST=compile & run for CrOS, compile for all other platforms
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
TBR=jam (API change)
Review URL: https://codereview.chromium.org/1269503007
Cr-Commit-Position: refs/heads/master@{#341758}
diff --git a/ui/gl/gl_surface_ozone.cc b/ui/gl/gl_surface_ozone.cc
index 6742c87..9f874d4e 100644
--- a/ui/gl/gl_surface_ozone.cc
+++ b/ui/gl/gl_surface_ozone.cc
@@ -547,14 +547,13 @@
ui::OzonePlatform::GetInstance()
->GetSurfaceFactoryOzone()
->CreateNativePixmap(widget_, GetSize(),
- ui::SurfaceFactoryOzone::BGRA_8888,
- ui::SurfaceFactoryOzone::SCANOUT);
+ gfx::BufferFormat::BGRA_8888,
+ gfx::BufferUsage::SCANOUT);
if (!pixmap)
return false;
scoped_refptr<GLImageOzoneNativePixmap> image =
new GLImageOzoneNativePixmap(GetSize(), GL_BGRA_EXT);
- if (!image->Initialize(pixmap.get(),
- gfx::GpuMemoryBuffer::Format::BGRA_8888))
+ if (!image->Initialize(pixmap.get(), gfx::BufferFormat::BGRA_8888))
return false;
images_[i] = image;
// Bind image to texture.
