Rename enum gfx::BufferFormat::RGBX_8888 to BGRX_8888

This seems to be a typo from the beginning. The enum value RGBX_8888 is
in fact treated as BGRX_8888 format everywhere, so we should correct it
to prevent future confusion.

BUG=none
TEST=trybot (this is a trivial renaming CL)
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
R=reveman@chromium.org, spang@chromium.org
TBR=posciak (OWNER content/common/gpu/media/vaapi_drm_picture.cc as communicated verbally)

Review URL: https://codereview.chromium.org/1301253003 .

Cr-Commit-Position: refs/heads/master@{#344640}

20 files changed, 40 insertions, 40 deletions

diff --git a/cc/test/test_gpu_memory_buffer_manager.cc b/cc/test/test_gpu_memory_buffer_manager.cc
index 8d56a97..9989e7a 100644
--- a/cc/test/test_gpu_memory_buffer_manager.cc
+++ b/cc/test/test_gpu_memory_buffer_manager.cc
@@ -22,7 +22,7 @@ size_t SubsamplingFactor(gfx::BufferFormat format, int plane) {
     case gfx::BufferFormat::R_8:
     case gfx::BufferFormat::RGBA_4444:
     case gfx::BufferFormat::RGBA_8888:
-    case gfx::BufferFormat::RGBX_8888:
+    case gfx::BufferFormat::BGRX_8888:
     case gfx::BufferFormat::BGRA_8888:
       return 1;
     case gfx::BufferFormat::YUV_420: {
@@ -58,7 +58,7 @@ size_t StrideInBytes(size_t width, gfx::BufferFormat format, int plane) {
       DCHECK_EQ(plane, 0);
       return width * 2;
     case gfx::BufferFormat::RGBA_8888:
-    case gfx::BufferFormat::RGBX_8888:
+    case gfx::BufferFormat::BGRX_8888:
     case gfx::BufferFormat::BGRA_8888:
       DCHECK_EQ(plane, 0);
       return width * 4;
diff --git a/components/view_manager/gles2/mojo_gpu_memory_buffer.cc b/components/view_manager/gles2/mojo_gpu_memory_buffer.cc
index 1354d7c..acd399b 100644
--- a/components/view_manager/gles2/mojo_gpu_memory_buffer.cc
+++ b/components/view_manager/gles2/mojo_gpu_memory_buffer.cc
@@ -23,7 +23,7 @@ size_t SubsamplingFactor(gfx::BufferFormat format, int plane) {
     case gfx::BufferFormat::R_8:
     case gfx::BufferFormat::RGBA_4444:
     case gfx::BufferFormat::RGBA_8888:
-    case gfx::BufferFormat::RGBX_8888:
+    case gfx::BufferFormat::BGRX_8888:
     case gfx::BufferFormat::BGRA_8888:
       return 1;
     case gfx::BufferFormat::YUV_420: {
@@ -59,7 +59,7 @@ size_t StrideInBytes(size_t width, gfx::BufferFormat format, int plane) {
       DCHECK_EQ(plane, 0);
       return width * 2;
     case gfx::BufferFormat::RGBA_8888:
-    case gfx::BufferFormat::RGBX_8888:
+    case gfx::BufferFormat::BGRX_8888:
     case gfx::BufferFormat::BGRA_8888:
       DCHECK_EQ(plane, 0);
       return width * 4;
diff --git a/content/browser/compositor/buffer_queue_unittest.cc b/content/browser/compositor/buffer_queue_unittest.cc
index 0fe4173..5d5d538 100644
--- a/content/browser/compositor/buffer_queue_unittest.cc
+++ b/content/browser/compositor/buffer_queue_unittest.cc
@@ -31,7 +31,7 @@ class StubGpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
   void Unmap() override {}
   bool IsMapped() const override { return false; }
   gfx::BufferFormat GetFormat() const override {
-    return gfx::BufferFormat::RGBX_8888;
+    return gfx::BufferFormat::BGRX_8888;
   }
   void GetStride(int* stride) const override {}
   gfx::GpuMemoryBufferId GetId() const override {
diff --git a/content/browser/gpu/browser_gpu_memory_buffer_manager.cc b/content/browser/gpu/browser_gpu_memory_buffer_manager.cc
index 99394ac..b6c66ed 100644
--- a/content/browser/gpu/browser_gpu_memory_buffer_manager.cc
+++ b/content/browser/gpu/browser_gpu_memory_buffer_manager.cc
@@ -128,7 +128,7 @@ GetSupportedGpuMemoryBufferConfigurations(gfx::GpuMemoryBufferType type) {
 #if defined(USE_OZONE) || defined(OS_MACOSX)
   const GpuMemoryBufferFactory::Configuration kScanoutConfigurations[] = {
       {gfx::BufferFormat::BGRA_8888, gfx::BufferUsage::SCANOUT},
-      {gfx::BufferFormat::RGBX_8888, gfx::BufferUsage::SCANOUT},
+      {gfx::BufferFormat::BGRX_8888, gfx::BufferUsage::SCANOUT},
       {gfx::BufferFormat::YUV_420_BIPLANAR, gfx::BufferUsage::SCANOUT},
   };
   for (auto& configuration : kScanoutConfigurations) {
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl.cc b/content/common/gpu/client/gpu_memory_buffer_impl.cc
index 8daabd0..16a906c 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl.cc
+++ b/content/common/gpu/client/gpu_memory_buffer_impl.cc
@@ -90,7 +90,7 @@ size_t GpuMemoryBufferImpl::SubsamplingFactor(gfx::BufferFormat format,
     case gfx::BufferFormat::R_8:
     case gfx::BufferFormat::RGBA_4444:
     case gfx::BufferFormat::RGBA_8888:
-    case gfx::BufferFormat::RGBX_8888:
+    case gfx::BufferFormat::BGRX_8888:
     case gfx::BufferFormat::BGRA_8888:
       return 1;
     case gfx::BufferFormat::YUV_420: {
@@ -138,7 +138,7 @@ bool GpuMemoryBufferImpl::RowSizeInBytes(size_t width,
       if (!checked_size.IsValid())
         return false;
       *size_in_bytes = checked_size.ValueOrDie();
-    case gfx::BufferFormat::RGBX_8888:
+    case gfx::BufferFormat::BGRX_8888:
     case gfx::BufferFormat::RGBA_8888:
     case gfx::BufferFormat::BGRA_8888:
       checked_size *= 4;
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.cc b/content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.cc
index b25d834..09f1b39 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.cc
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.cc
@@ -111,7 +111,7 @@ bool GpuMemoryBufferImplSharedMemory::IsFormatSupported(
     case gfx::BufferFormat::YUV_420:
     case gfx::BufferFormat::YUV_420_BIPLANAR:
       return true;
-    case gfx::BufferFormat::RGBX_8888:
+    case gfx::BufferFormat::BGRX_8888:
       return false;
   }
 
@@ -149,7 +149,7 @@ bool GpuMemoryBufferImplSharedMemory::IsSizeValidForFormat(
     case gfx::BufferFormat::RGBA_4444:
     case gfx::BufferFormat::RGBA_8888:
     case gfx::BufferFormat::BGRA_8888:
-    case gfx::BufferFormat::RGBX_8888:
+    case gfx::BufferFormat::BGRX_8888:
       return true;
     case gfx::BufferFormat::YUV_420:
     case gfx::BufferFormat::YUV_420_BIPLANAR: {
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
index 2bbea50..c0d19b6 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
@@ -23,7 +23,7 @@ int WindowFormat(gfx::BufferFormat format) {
     case gfx::BufferFormat::ETC1:
     case gfx::BufferFormat::R_8:
     case gfx::BufferFormat::RGBA_4444:
-    case gfx::BufferFormat::RGBX_8888:
+    case gfx::BufferFormat::BGRX_8888:
     case gfx::BufferFormat::BGRA_8888:
     case gfx::BufferFormat::YUV_420:
     case gfx::BufferFormat::YUV_420_BIPLANAR:
diff --git a/content/common/gpu/gpu_memory_buffer_factory_io_surface.cc b/content/common/gpu/gpu_memory_buffer_factory_io_surface.cc
index 0c13bec..8c0ab4d 100644
--- a/content/common/gpu/gpu_memory_buffer_factory_io_surface.cc
+++ b/content/common/gpu/gpu_memory_buffer_factory_io_surface.cc
@@ -43,7 +43,7 @@ int32 BytesPerElement(gfx::BufferFormat format, int plane) {
     case gfx::BufferFormat::ETC1:
     case gfx::BufferFormat::RGBA_4444:
     case gfx::BufferFormat::RGBA_8888:
-    case gfx::BufferFormat::RGBX_8888:
+    case gfx::BufferFormat::BGRX_8888:
     case gfx::BufferFormat::YUV_420:
       NOTREACHED();
       return 0;
@@ -68,7 +68,7 @@ int32 PixelFormat(gfx::BufferFormat format) {
     case gfx::BufferFormat::ETC1:
     case gfx::BufferFormat::RGBA_4444:
     case gfx::BufferFormat::RGBA_8888:
-    case gfx::BufferFormat::RGBX_8888:
+    case gfx::BufferFormat::BGRX_8888:
     case gfx::BufferFormat::YUV_420:
       NOTREACHED();
       return 0;
diff --git a/content/common/gpu/media/vaapi_drm_picture.cc b/content/common/gpu/media/vaapi_drm_picture.cc
index 1e4aa1f..45cd8b3 100644
--- a/content/common/gpu/media/vaapi_drm_picture.cc
+++ b/content/common/gpu/media/vaapi_drm_picture.cc
@@ -96,7 +96,7 @@ scoped_refptr<ui::NativePixmap> VaapiDrmPicture::CreateNativePixmap(
 
   // Create a buffer from Ozone.
   return factory->CreateNativePixmap(gfx::kNullAcceleratedWidget, size,
-                                     gfx::BufferFormat::RGBX_8888,
+                                     gfx::BufferFormat::BGRX_8888,
                                      gfx::BufferUsage::SCANOUT);
 }
 
@@ -129,7 +129,7 @@ bool VaapiDrmPicture::Initialize() {
                                           texture_id());
   scoped_refptr<gfx::GLImageOzoneNativePixmap> image(
       new gfx::GLImageOzoneNativePixmap(size(), GL_BGRA_EXT));
-  if (!image->Initialize(pixmap_.get(), gfx::BufferFormat::RGBX_8888)) {
+  if (!image->Initialize(pixmap_.get(), gfx::BufferFormat::BGRX_8888)) {
     LOG(ERROR) << "Failed to create GLImage";
     return false;
   }
diff --git a/gpu/command_buffer/service/image_factory.cc b/gpu/command_buffer/service/image_factory.cc
index eeecc16..8d9cde6 100644
--- a/gpu/command_buffer/service/image_factory.cc
+++ b/gpu/command_buffer/service/image_factory.cc
@@ -22,7 +22,7 @@ gfx::BufferFormat ImageFactory::ImageFormatToGpuMemoryBufferFormat(
     case GL_R8:
       return gfx::BufferFormat::R_8;
     case GL_RGB:
-      return gfx::BufferFormat::RGBX_8888;
+      return gfx::BufferFormat::BGRX_8888;
     case GL_RGBA:
       return gfx::BufferFormat::RGBA_8888;
     case GL_BGRA_EXT:
@@ -67,12 +67,12 @@ bool ImageFactory::IsImageFormatCompatibleWithGpuMemoryBufferFormat(
     case gfx::BufferFormat::ATC:
     case gfx::BufferFormat::ATCIA:
     case gfx::BufferFormat::BGRA_8888:
+    case gfx::BufferFormat::BGRX_8888:
     case gfx::BufferFormat::DXT1:
     case gfx::BufferFormat::DXT5:
     case gfx::BufferFormat::ETC1:
     case gfx::BufferFormat::R_8:
     case gfx::BufferFormat::RGBA_8888:
-    case gfx::BufferFormat::RGBX_8888:
     case gfx::BufferFormat::YUV_420:
       return ImageFormatToGpuMemoryBufferFormat(internalformat) == format;
     case gfx::BufferFormat::RGBA_4444:
@@ -105,7 +105,7 @@ bool ImageFactory::IsGpuMemoryBufferFormatSupported(
       return capabilities.texture_rg;
     case gfx::BufferFormat::RGBA_4444:
     case gfx::BufferFormat::RGBA_8888:
-    case gfx::BufferFormat::RGBX_8888:
+    case gfx::BufferFormat::BGRX_8888:
     case gfx::BufferFormat::YUV_420:
     case gfx::BufferFormat::YUV_420_BIPLANAR:
       return true;
@@ -132,7 +132,7 @@ bool ImageFactory::IsImageSizeValidForGpuMemoryBufferFormat(
     case gfx::BufferFormat::RGBA_4444:
     case gfx::BufferFormat::RGBA_8888:
     case gfx::BufferFormat::BGRA_8888:
-    case gfx::BufferFormat::RGBX_8888:
+    case gfx::BufferFormat::BGRX_8888:
       return true;
     case gfx::BufferFormat::YUV_420:
     case gfx::BufferFormat::YUV_420_BIPLANAR:
diff --git a/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc b/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc
index 4d6f933..45003a3 100644
--- a/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc
+++ b/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc
@@ -112,7 +112,7 @@ void SetRow(gfx::BufferFormat format,
     case gfx::BufferFormat::DXT1:
     case gfx::BufferFormat::DXT5:
     case gfx::BufferFormat::ETC1:
-    case gfx::BufferFormat::RGBX_8888:
+    case gfx::BufferFormat::BGRX_8888:
     case gfx::BufferFormat::YUV_420:
     case gfx::BufferFormat::YUV_420_BIPLANAR:
       NOTREACHED();
@@ -136,7 +136,7 @@ GLenum InternalFormat(gfx::BufferFormat format) {
     case gfx::BufferFormat::DXT1:
     case gfx::BufferFormat::DXT5:
     case gfx::BufferFormat::ETC1:
-    case gfx::BufferFormat::RGBX_8888:
+    case gfx::BufferFormat::BGRX_8888:
     case gfx::BufferFormat::YUV_420:
     case gfx::BufferFormat::YUV_420_BIPLANAR:
       NOTREACHED();
diff --git a/gpu/command_buffer/tests/gl_manager.cc b/gpu/command_buffer/tests/gl_manager.cc
index f32792f..936e326 100644
--- a/gpu/command_buffer/tests/gl_manager.cc
+++ b/gpu/command_buffer/tests/gl_manager.cc
@@ -50,7 +50,7 @@ size_t SubsamplingFactor(gfx::BufferFormat format, int plane) {
     case gfx::BufferFormat::R_8:
     case gfx::BufferFormat::RGBA_4444:
     case gfx::BufferFormat::RGBA_8888:
-    case gfx::BufferFormat::RGBX_8888:
+    case gfx::BufferFormat::BGRX_8888:
     case gfx::BufferFormat::BGRA_8888:
       return 1;
     case gfx::BufferFormat::YUV_420: {
@@ -89,7 +89,7 @@ size_t StrideInBytes(size_t width, gfx::BufferFormat format, int plane) {
     case gfx::BufferFormat::BGRA_8888:
       DCHECK_EQ(plane, 0);
       return width * 4;
-    case gfx::BufferFormat::RGBX_8888:
+    case gfx::BufferFormat::BGRX_8888:
       NOTREACHED();
       return 0;
     case gfx::BufferFormat::YUV_420:
diff --git a/ui/gfx/buffer_format_util.cc b/ui/gfx/buffer_format_util.cc
index 12e67af..202fb74 100644
--- a/ui/gfx/buffer_format_util.cc
+++ b/ui/gfx/buffer_format_util.cc
@@ -18,7 +18,7 @@ size_t NumberOfPlanesForBufferFormat(BufferFormat format) {
     case BufferFormat::R_8:
     case BufferFormat::RGBA_4444:
     case BufferFormat::RGBA_8888:
-    case BufferFormat::RGBX_8888:
+    case BufferFormat::BGRX_8888:
     case BufferFormat::BGRA_8888:
       return 1;
     case BufferFormat::YUV_420_BIPLANAR:
diff --git a/ui/gfx/buffer_types.h b/ui/gfx/buffer_types.h
index db916ff..c6d0e09 100644
--- a/ui/gfx/buffer_types.h
+++ b/ui/gfx/buffer_types.h
@@ -18,7 +18,7 @@ enum class BufferFormat {
   R_8,
   RGBA_4444,
   RGBA_8888,
-  RGBX_8888,
+  BGRX_8888,
   BGRA_8888,
   YUV_420,
   YUV_420_BIPLANAR,
diff --git a/ui/gl/gl_image_io_surface.mm b/ui/gl/gl_image_io_surface.mm
index 3b8edcb..ef091f7 100644
--- a/ui/gl/gl_image_io_surface.mm
+++ b/ui/gl/gl_image_io_surface.mm
@@ -43,7 +43,7 @@ bool ValidFormat(BufferFormat format) {
     case BufferFormat::ETC1:
     case BufferFormat::RGBA_4444:
     case BufferFormat::RGBA_8888:
-    case BufferFormat::RGBX_8888:
+    case BufferFormat::BGRX_8888:
     case BufferFormat::YUV_420:
     case BufferFormat::YUV_420_BIPLANAR:
       return false;
@@ -66,7 +66,7 @@ GLenum TextureFormat(BufferFormat format) {
     case BufferFormat::ETC1:
     case BufferFormat::RGBA_4444:
     case BufferFormat::RGBA_8888:
-    case BufferFormat::RGBX_8888:
+    case BufferFormat::BGRX_8888:
     case BufferFormat::YUV_420:
     case BufferFormat::YUV_420_BIPLANAR:
       NOTREACHED();
@@ -90,7 +90,7 @@ GLenum DataFormat(BufferFormat format) {
     case BufferFormat::ETC1:
     case BufferFormat::RGBA_4444:
     case BufferFormat::RGBA_8888:
-    case BufferFormat::RGBX_8888:
+    case BufferFormat::BGRX_8888:
     case BufferFormat::YUV_420:
     case BufferFormat::YUV_420_BIPLANAR:
       NOTREACHED();
@@ -114,7 +114,7 @@ GLenum DataType(BufferFormat format) {
     case BufferFormat::ETC1:
     case BufferFormat::RGBA_4444:
     case BufferFormat::RGBA_8888:
-    case BufferFormat::RGBX_8888:
+    case BufferFormat::BGRX_8888:
     case BufferFormat::YUV_420:
     case BufferFormat::YUV_420_BIPLANAR:
       NOTREACHED();
diff --git a/ui/gl/gl_image_memory.cc b/ui/gl/gl_image_memory.cc
index aa308be..c2ab57a 100644
--- a/ui/gl/gl_image_memory.cc
+++ b/ui/gl/gl_image_memory.cc
@@ -45,7 +45,7 @@ bool ValidFormat(BufferFormat format) {
     case BufferFormat::RGBA_8888:
     case BufferFormat::BGRA_8888:
       return true;
-    case BufferFormat::RGBX_8888:
+    case BufferFormat::BGRX_8888:
     case BufferFormat::YUV_420:
     case BufferFormat::YUV_420_BIPLANAR:
       return false;
@@ -67,7 +67,7 @@ bool IsCompressedFormat(BufferFormat format) {
     case BufferFormat::RGBA_4444:
     case BufferFormat::RGBA_8888:
     case BufferFormat::BGRA_8888:
-    case BufferFormat::RGBX_8888:
+    case BufferFormat::BGRX_8888:
     case BufferFormat::YUV_420:
     case BufferFormat::YUV_420_BIPLANAR:
       return false;
@@ -96,7 +96,7 @@ GLenum TextureFormat(BufferFormat format) {
       return GL_RGBA;
     case BufferFormat::BGRA_8888:
       return GL_BGRA_EXT;
-    case BufferFormat::RGBX_8888:
+    case BufferFormat::BGRX_8888:
     case BufferFormat::YUV_420:
     case BufferFormat::YUV_420_BIPLANAR:
       NOTREACHED();
@@ -124,7 +124,7 @@ GLenum DataType(BufferFormat format) {
     case BufferFormat::DXT1:
     case BufferFormat::DXT5:
     case BufferFormat::ETC1:
-    case BufferFormat::RGBX_8888:
+    case BufferFormat::BGRX_8888:
     case BufferFormat::YUV_420:
     case BufferFormat::YUV_420_BIPLANAR:
       NOTREACHED();
@@ -205,7 +205,7 @@ bool GLImageMemory::StrideInBytes(size_t width,
         return false;
       *stride_in_bytes = checked_stride.ValueOrDie();
       return true;
-    case BufferFormat::RGBX_8888:
+    case BufferFormat::BGRX_8888:
     case BufferFormat::YUV_420:
     case BufferFormat::YUV_420_BIPLANAR:
       NOTREACHED();
diff --git a/ui/gl/gl_image_ozone_native_pixmap.cc b/ui/gl/gl_image_ozone_native_pixmap.cc
index 84174e2..17c233b 100644
--- a/ui/gl/gl_image_ozone_native_pixmap.cc
+++ b/ui/gl/gl_image_ozone_native_pixmap.cc
@@ -27,7 +27,7 @@ bool ValidInternalFormat(unsigned internalformat) {
 bool ValidFormat(gfx::BufferFormat format) {
   switch (format) {
     case BufferFormat::BGRA_8888:
-    case BufferFormat::RGBX_8888:
+    case BufferFormat::BGRX_8888:
       return true;
     case BufferFormat::ATC:
     case BufferFormat::ATCIA:
@@ -50,7 +50,7 @@ EGLint FourCC(gfx::BufferFormat format) {
   switch (format) {
     case BufferFormat::BGRA_8888:
       return DRM_FORMAT_ARGB8888;
-    case BufferFormat::RGBX_8888:
+    case BufferFormat::BGRX_8888:
       return DRM_FORMAT_XRGB8888;
     case BufferFormat::ATC:
     case BufferFormat::ATCIA:
diff --git a/ui/ozone/demo/surfaceless_gl_renderer.cc b/ui/ozone/demo/surfaceless_gl_renderer.cc
index 5e71588..2515803 100644
--- a/ui/ozone/demo/surfaceless_gl_renderer.cc
+++ b/ui/ozone/demo/surfaceless_gl_renderer.cc
@@ -38,11 +38,11 @@ bool SurfacelessGlRenderer::BufferWrapper::Initialize(
   scoped_refptr<NativePixmap> pixmap =
       OzonePlatform::GetInstance()
           ->GetSurfaceFactoryOzone()
-          ->CreateNativePixmap(widget, size, gfx::BufferFormat::RGBX_8888,
+          ->CreateNativePixmap(widget, size, gfx::BufferFormat::BGRX_8888,
                                gfx::BufferUsage::SCANOUT);
   scoped_refptr<gfx::GLImageOzoneNativePixmap> image(
       new gfx::GLImageOzoneNativePixmap(size, GL_RGB));
-  if (!image->Initialize(pixmap.get(), gfx::BufferFormat::RGBX_8888)) {
+  if (!image->Initialize(pixmap.get(), gfx::BufferFormat::BGRX_8888)) {
     LOG(ERROR) << "Failed to create GLImage";
     return false;
   }
diff --git a/ui/ozone/platform/drm/common/client_native_pixmap_factory_gbm.cc b/ui/ozone/platform/drm/common/client_native_pixmap_factory_gbm.cc
index ca150e5..74a79fb 100644
--- a/ui/ozone/platform/drm/common/client_native_pixmap_factory_gbm.cc
+++ b/ui/ozone/platform/drm/common/client_native_pixmap_factory_gbm.cc
@@ -20,7 +20,7 @@ class ClientNativePixmapFactoryGbm : public ClientNativePixmapFactory {
   std::vector<Configuration> GetSupportedConfigurations() const override {
     const Configuration kConfiguratioins[] = {
         {gfx::BufferFormat::BGRA_8888, gfx::BufferUsage::SCANOUT},
-        {gfx::BufferFormat::RGBX_8888, gfx::BufferUsage::SCANOUT}};
+        {gfx::BufferFormat::BGRX_8888, gfx::BufferUsage::SCANOUT}};
     std::vector<Configuration> configurations(
         kConfiguratioins, kConfiguratioins + arraysize(kConfiguratioins));
     return configurations;
diff --git a/ui/ozone/platform/drm/gpu/gbm_buffer.cc b/ui/ozone/platform/drm/gpu/gbm_buffer.cc
index b47dc54..e940ad6 100644
--- a/ui/ozone/platform/drm/gpu/gbm_buffer.cc
+++ b/ui/ozone/platform/drm/gpu/gbm_buffer.cc
@@ -23,7 +23,7 @@ int GetGbmFormatFromBufferFormat(gfx::BufferFormat fmt) {
   switch (fmt) {
     case gfx::BufferFormat::BGRA_8888:
       return GBM_BO_FORMAT_ARGB8888;
-    case gfx::BufferFormat::RGBX_8888:
+    case gfx::BufferFormat::BGRX_8888:
       return GBM_BO_FORMAT_XRGB8888;
     default:
       NOTREACHED();