Index: ui/gfx/buffer_format_util.cc |
diff --git a/ui/gfx/buffer_format_util.cc b/ui/gfx/buffer_format_util.cc |
index df2396ac6fc26d58c725a3d21059121bc3ca9d95..6c70724766072f305cdb77be9c674b2f502f3341 100644 |
--- a/ui/gfx/buffer_format_util.cc |
+++ b/ui/gfx/buffer_format_util.cc |
@@ -11,15 +11,22 @@ |
namespace gfx { |
namespace { |
-const BufferFormat kBufferFormats[] = { |
- BufferFormat::ATC, BufferFormat::ATCIA, |
- BufferFormat::DXT1, BufferFormat::DXT5, |
- BufferFormat::ETC1, BufferFormat::R_8, |
- BufferFormat::BGR_565, BufferFormat::RGBA_4444, |
- BufferFormat::RGBX_8888, BufferFormat::RGBA_8888, |
- BufferFormat::BGRX_8888, BufferFormat::BGRA_8888, |
- BufferFormat::UYVY_422, BufferFormat::YUV_420_BIPLANAR, |
- BufferFormat::YVU_420}; |
+const BufferFormat kBufferFormats[] = {BufferFormat::ATC, |
+ BufferFormat::ATCIA, |
+ BufferFormat::DXT1, |
+ BufferFormat::DXT5, |
+ BufferFormat::ETC1, |
+ BufferFormat::R_8, |
+ BufferFormat::RG_88, |
+ BufferFormat::BGR_565, |
+ BufferFormat::RGBA_4444, |
+ BufferFormat::RGBX_8888, |
+ BufferFormat::RGBA_8888, |
+ BufferFormat::BGRX_8888, |
+ BufferFormat::BGRA_8888, |
+ BufferFormat::UYVY_422, |
+ BufferFormat::YUV_420_BIPLANAR, |
+ BufferFormat::YVU_420}; |
static_assert(arraysize(kBufferFormats) == |
(static_cast<int>(BufferFormat::LAST) + 1), |
@@ -48,6 +55,7 @@ bool RowSizeForBufferFormatChecked( |
return false; |
*size_in_bytes = checked_size.ValueOrDie() & ~0x3; |
return true; |
+ case BufferFormat::RG_88: |
case BufferFormat::BGR_565: |
case BufferFormat::RGBA_4444: |
case BufferFormat::UYVY_422: |
@@ -93,6 +101,7 @@ size_t NumberOfPlanesForBufferFormat(BufferFormat format) { |
case BufferFormat::DXT5: |
case BufferFormat::ETC1: |
case BufferFormat::R_8: |
+ case BufferFormat::RG_88: |
case BufferFormat::BGR_565: |
case BufferFormat::RGBA_4444: |
case BufferFormat::RGBX_8888: |
@@ -118,6 +127,7 @@ size_t SubsamplingFactorForBufferFormat(BufferFormat format, size_t plane) { |
case BufferFormat::DXT5: |
case BufferFormat::ETC1: |
case BufferFormat::R_8: |
+ case BufferFormat::RG_88: |
case BufferFormat::BGR_565: |
case BufferFormat::RGBA_4444: |
case BufferFormat::RGBX_8888: |
@@ -188,6 +198,7 @@ size_t BufferOffsetForBufferFormat(const Size& size, |
case BufferFormat::DXT5: |
case BufferFormat::ETC1: |
case BufferFormat::R_8: |
+ case BufferFormat::RG_88: |
case BufferFormat::BGR_565: |
case BufferFormat::RGBA_4444: |
case BufferFormat::RGBX_8888: |