From d17ea114e5ef69ad5d5d7413280a13e6428098aa Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 15 May 2018 10:20:33 +0200 Subject: BASELINE: Update Chromium to 67.0.3396.47 Change-Id: Idcb1341782e417561a2473eeecc82642dafda5b7 Reviewed-by: Michal Klocek --- chromium/ui/gl/gl_image_memory.cc | 64 ++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 31 deletions(-) (limited to 'chromium/ui/gl/gl_image_memory.cc') diff --git a/chromium/ui/gl/gl_image_memory.cc b/chromium/ui/gl/gl_image_memory.cc index 1f5b76838bd..167ed71891f 100644 --- a/chromium/ui/gl/gl_image_memory.cc +++ b/chromium/ui/gl/gl_image_memory.cc @@ -39,36 +39,6 @@ bool ValidInternalFormat(unsigned internalformat) { } } -bool ValidFormat(gfx::BufferFormat format) { - switch (format) { - case gfx::BufferFormat::ATC: - case gfx::BufferFormat::ATCIA: - case gfx::BufferFormat::DXT1: - case gfx::BufferFormat::DXT5: - case gfx::BufferFormat::ETC1: - case gfx::BufferFormat::R_8: - case gfx::BufferFormat::R_16: - case gfx::BufferFormat::RG_88: - case gfx::BufferFormat::BGR_565: - case gfx::BufferFormat::RGBA_4444: - case gfx::BufferFormat::RGBX_8888: - case gfx::BufferFormat::RGBA_8888: - case gfx::BufferFormat::BGRX_8888: - case gfx::BufferFormat::BGRX_1010102: - case gfx::BufferFormat::RGBX_1010102: - case gfx::BufferFormat::BGRA_8888: - case gfx::BufferFormat::RGBA_F16: - return true; - case gfx::BufferFormat::YVU_420: - case gfx::BufferFormat::YUV_420_BIPLANAR: - case gfx::BufferFormat::UYVY_422: - return false; - } - - NOTREACHED(); - return false; -} - bool IsCompressedFormat(gfx::BufferFormat format) { switch (format) { case gfx::BufferFormat::ATC: @@ -532,7 +502,8 @@ bool GLImageMemory::ScheduleOverlayPlane(gfx::AcceleratedWidget widget, int z_order, gfx::OverlayTransform transform, const gfx::Rect& bounds_rect, - const gfx::RectF& crop_rect) { + const gfx::RectF& crop_rect, + bool enable_blend) { return false; } @@ -546,4 +517,35 @@ unsigned GLImageMemory::GetInternalFormatForTesting(gfx::BufferFormat format) { return TextureFormat(format); } +// static +bool GLImageMemory::ValidFormat(gfx::BufferFormat format) { + switch (format) { + case gfx::BufferFormat::ATC: + case gfx::BufferFormat::ATCIA: + case gfx::BufferFormat::DXT1: + case gfx::BufferFormat::DXT5: + case gfx::BufferFormat::ETC1: + case gfx::BufferFormat::R_8: + case gfx::BufferFormat::R_16: + case gfx::BufferFormat::RG_88: + case gfx::BufferFormat::BGR_565: + case gfx::BufferFormat::RGBA_4444: + case gfx::BufferFormat::RGBX_8888: + case gfx::BufferFormat::RGBA_8888: + case gfx::BufferFormat::BGRX_8888: + case gfx::BufferFormat::BGRX_1010102: + case gfx::BufferFormat::RGBX_1010102: + case gfx::BufferFormat::BGRA_8888: + case gfx::BufferFormat::RGBA_F16: + return true; + case gfx::BufferFormat::YVU_420: + case gfx::BufferFormat::YUV_420_BIPLANAR: + case gfx::BufferFormat::UYVY_422: + return false; + } + + NOTREACHED(); + return false; +} + } // namespace gl -- cgit v1.2.1