Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / ui / ozone / platform / dri / gbm_buffer.cc

diff --git a/src/ui/ozone/platform/dri/gbm_buffer.cc b/src/ui/ozone/platform/dri/gbm_buffer.cc
index 79e8b3b..398064d 100644 (file)
--- a/src/ui/ozone/platform/dri/gbm_buffer.cc
+++ b/src/ui/ozone/platform/dri/gbm_buffer.cc
@@ -14,17 +14,14 @@ namespace {
 
 int GetGbmFormatFromBufferFormat(SurfaceFactoryOzone::BufferFormat fmt) {
   switch (fmt) {
-    case SurfaceFactoryOzone::UNKNOWN:
-      return 0;
-    // TODO(alexst): Setting this to XRGB for now to allow presentation
-    // as a primary plane but disallowing overlay transparency. Address this
-    // to allow both use cases.
     case SurfaceFactoryOzone::RGBA_8888:
-      return GBM_FORMAT_XRGB8888;
-    case SurfaceFactoryOzone::RGB_888:
-      return GBM_FORMAT_RGB888;
+      return GBM_BO_FORMAT_ARGB8888;
+    case SurfaceFactoryOzone::RGBX_8888:
+      return GBM_BO_FORMAT_XRGB8888;
+    default:
+      NOTREACHED();
+      return 0;
   }
-  return 0;
 }
 
 }  // namespace