Index: ui/gl/gl_image_memory.cc |
diff --git a/ui/gl/gl_image_memory.cc b/ui/gl/gl_image_memory.cc |
index 902291759eb066ca741833e50f304c435582e1ee..ff9c97ee297255c476c2a31c607057bfe6d7051a 100644 |
--- a/ui/gl/gl_image_memory.cc |
+++ b/ui/gl/gl_image_memory.cc |
@@ -38,6 +38,7 @@ bool ValidFormat(gfx::GpuMemoryBuffer::Format format) { |
case gfx::GpuMemoryBuffer::BGRA_8888: |
return true; |
case gfx::GpuMemoryBuffer::RGBX_8888: |
+ case gfx::GpuMemoryBuffer::YUV_420: |
return false; |
} |
@@ -52,6 +53,7 @@ bool IsCompressedFormat(gfx::GpuMemoryBuffer::Format format) { |
case gfx::GpuMemoryBuffer::DXT1: |
case gfx::GpuMemoryBuffer::DXT5: |
case gfx::GpuMemoryBuffer::ETC1: |
+ case gfx::GpuMemoryBuffer::YUV_420: |
return true; |
case gfx::GpuMemoryBuffer::RGBA_8888: |
case gfx::GpuMemoryBuffer::BGRA_8888: |
@@ -80,6 +82,7 @@ GLenum TextureFormat(gfx::GpuMemoryBuffer::Format format) { |
case gfx::GpuMemoryBuffer::BGRA_8888: |
return GL_BGRA_EXT; |
case gfx::GpuMemoryBuffer::RGBX_8888: |
+ case gfx::GpuMemoryBuffer::YUV_420: |
NOTREACHED(); |
return 0; |
} |
@@ -103,6 +106,7 @@ GLenum DataType(gfx::GpuMemoryBuffer::Format format) { |
case gfx::GpuMemoryBuffer::DXT5: |
case gfx::GpuMemoryBuffer::ETC1: |
case gfx::GpuMemoryBuffer::RGBX_8888: |
+ case gfx::GpuMemoryBuffer::YUV_420: |
NOTREACHED(); |
return 0; |
} |
@@ -153,10 +157,6 @@ bool GLImageMemory::StrideInBytes(size_t width, |
size_t* stride_in_bytes) { |
base::CheckedNumeric<size_t> s = width; |
switch (format) { |
- case gfx::GpuMemoryBuffer::ATCIA: |
- case gfx::GpuMemoryBuffer::DXT5: |
- *stride_in_bytes = width; |
- return true; |
case gfx::GpuMemoryBuffer::ATC: |
case gfx::GpuMemoryBuffer::DXT1: |
case gfx::GpuMemoryBuffer::ETC1: |
@@ -164,18 +164,21 @@ bool GLImageMemory::StrideInBytes(size_t width, |
s /= 2; |
if (!s.IsValid()) |
return false; |
- |
*stride_in_bytes = s.ValueOrDie(); |
return true; |
+ case gfx::GpuMemoryBuffer::ATCIA: |
+ case gfx::GpuMemoryBuffer::DXT5: |
+ *stride_in_bytes = width; |
+ return true; |
case gfx::GpuMemoryBuffer::RGBA_8888: |
case gfx::GpuMemoryBuffer::BGRA_8888: |
s *= 4; |
if (!s.IsValid()) |
return false; |
- |
*stride_in_bytes = s.ValueOrDie(); |
return true; |
case gfx::GpuMemoryBuffer::RGBX_8888: |
+ case gfx::GpuMemoryBuffer::YUV_420: |
NOTREACHED(); |
return false; |
} |