Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

gpu/command_buffer/service/image_factory.cc

Index: gpu/command_buffer/service/image_factory.cc
diff --git a/gpu/command_buffer/service/image_factory.cc b/gpu/command_buffer/service/image_factory.cc
index f940498abf7edcf6922223a7fbe208fe4141193d..9d4e659d02caee7b94fcaaeccbe9d2cb753883be 100644
--- a/gpu/command_buffer/service/image_factory.cc
+++ b/gpu/command_buffer/service/image_factory.cc
@@ -16,78 +16,78 @@ ImageFactory::~ImageFactory() {
 }
 
 // static
-gfx::GpuMemoryBuffer::Format ImageFactory::ImageFormatToGpuMemoryBufferFormat(
+gfx::BufferFormat ImageFactory::ImageFormatToGpuMemoryBufferFormat(
     unsigned internalformat) {
   switch (internalformat) {
     case GL_R8:
-      return gfx::GpuMemoryBuffer::R_8;
+      return gfx::BufferFormat::R_8;
     case GL_RGB:
-      return gfx::GpuMemoryBuffer::RGBX_8888;
+      return gfx::BufferFormat::RGBX_8888;
     case GL_RGBA:
-      return gfx::GpuMemoryBuffer::RGBA_8888;
+      return gfx::BufferFormat::RGBA_8888;
     case GL_BGRA_EXT:
-      return gfx::GpuMemoryBuffer::BGRA_8888;
+      return gfx::BufferFormat::BGRA_8888;
     case GL_ATC_RGB_AMD:
-      return gfx::GpuMemoryBuffer::ATC;
+      return gfx::BufferFormat::ATC;
     case GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD:
-      return gfx::GpuMemoryBuffer::ATCIA;
+      return gfx::BufferFormat::ATCIA;
     case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
-      return gfx::GpuMemoryBuffer::DXT1;
+      return gfx::BufferFormat::DXT1;
     case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
-      return gfx::GpuMemoryBuffer::DXT5;
+      return gfx::BufferFormat::DXT5;
     case GL_ETC1_RGB8_OES:
-      return gfx::GpuMemoryBuffer::ETC1;
+      return gfx::BufferFormat::ETC1;
     case GL_RGB_YUV_420_CHROMIUM:
-      return gfx::GpuMemoryBuffer::YUV_420;
+      return gfx::BufferFormat::YUV_420;
     default:
       NOTREACHED();
-      return gfx::GpuMemoryBuffer::RGBA_8888;
+      return gfx::BufferFormat::RGBA_8888;
   }
 }
 
 // static
-gfx::GpuMemoryBuffer::Usage ImageFactory::ImageUsageToGpuMemoryBufferUsage(
+gfx::BufferUsage ImageFactory::ImageUsageToGpuMemoryBufferUsage(
     unsigned usage) {
   switch (usage) {
     case GL_MAP_CHROMIUM:
-      return gfx::GpuMemoryBuffer::MAP;
+      return gfx::BufferUsage::MAP;
     case GL_SCANOUT_CHROMIUM:
-      return gfx::GpuMemoryBuffer::SCANOUT;
+      return gfx::BufferUsage::SCANOUT;
     default:
       NOTREACHED();
-      return gfx::GpuMemoryBuffer::MAP;
+      return gfx::BufferUsage::MAP;
   }
 }
 
 // static
 bool ImageFactory::IsImageFormatCompatibleWithGpuMemoryBufferFormat(
     unsigned internalformat,
-    gfx::GpuMemoryBuffer::Format format) {
+    gfx::BufferFormat format) {
   return ImageFormatToGpuMemoryBufferFormat(internalformat) == format;
 }
 
 // static
 bool ImageFactory::IsGpuMemoryBufferFormatSupported(
-    gfx::GpuMemoryBuffer::Format format,
+    gfx::BufferFormat format,
     const gpu::Capabilities& capabilities) {
   switch (format) {
-    case gfx::GpuMemoryBuffer::ATC:
-    case gfx::GpuMemoryBuffer::ATCIA:
+    case gfx::BufferFormat::ATC:
+    case gfx::BufferFormat::ATCIA:
       return capabilities.texture_format_atc;
-    case gfx::GpuMemoryBuffer::BGRA_8888:
+    case gfx::BufferFormat::BGRA_8888:
       return capabilities.texture_format_bgra8888;
-    case gfx::GpuMemoryBuffer::DXT1:
+    case gfx::BufferFormat::DXT1:
       return capabilities.texture_format_dxt1;
-    case gfx::GpuMemoryBuffer::DXT5:
+    case gfx::BufferFormat::DXT5:
       return capabilities.texture_format_dxt5;
-    case gfx::GpuMemoryBuffer::ETC1:
+    case gfx::BufferFormat::ETC1:
       return capabilities.texture_format_etc1;
-    case gfx::GpuMemoryBuffer::R_8:
+    case gfx::BufferFormat::R_8:
       return capabilities.texture_rg;
-    case gfx::GpuMemoryBuffer::RGBA_4444:
-    case gfx::GpuMemoryBuffer::RGBA_8888:
-    case gfx::GpuMemoryBuffer::RGBX_8888:
-    case gfx::GpuMemoryBuffer::YUV_420:
+    case gfx::BufferFormat::RGBA_4444:
+    case gfx::BufferFormat::RGBA_8888:
+    case gfx::BufferFormat::RGBX_8888:
+    case gfx::BufferFormat::YUV_420:
       return true;
   }
 
@@ -98,23 +98,23 @@ bool ImageFactory::IsGpuMemoryBufferFormatSupported(
 // static
 bool ImageFactory::IsImageSizeValidForGpuMemoryBufferFormat(
     const gfx::Size& size,
-    gfx::GpuMemoryBuffer::Format format) {
+    gfx::BufferFormat format) {
   switch (format) {
-    case gfx::GpuMemoryBuffer::ATC:
-    case gfx::GpuMemoryBuffer::ATCIA:
-    case gfx::GpuMemoryBuffer::DXT1:
-    case gfx::GpuMemoryBuffer::DXT5:
-    case gfx::GpuMemoryBuffer::ETC1:
+    case gfx::BufferFormat::ATC:
+    case gfx::BufferFormat::ATCIA:
+    case gfx::BufferFormat::DXT1:
+    case gfx::BufferFormat::DXT5:
+    case gfx::BufferFormat::ETC1:
       // Compressed images must have a width and height that's evenly divisible
       // by the block size.
       return size.width() % 4 == 0 && size.height() % 4 == 0;
-    case gfx::GpuMemoryBuffer::R_8:
-    case gfx::GpuMemoryBuffer::RGBA_4444:
-    case gfx::GpuMemoryBuffer::RGBA_8888:
-    case gfx::GpuMemoryBuffer::BGRA_8888:
-    case gfx::GpuMemoryBuffer::RGBX_8888:
+    case gfx::BufferFormat::R_8:
+    case gfx::BufferFormat::RGBA_4444:
+    case gfx::BufferFormat::RGBA_8888:
+    case gfx::BufferFormat::BGRA_8888:
+    case gfx::BufferFormat::RGBX_8888:
       return true;
-    case gfx::GpuMemoryBuffer::YUV_420:
+    case gfx::BufferFormat::YUV_420:
       // U and V planes are subsampled by a factor of 2.
       return size.width() % 2 == 0 && size.height() % 2 == 0;
   }