diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-20 10:33:36 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-22 11:45:12 +0000 |
| commit | be59a35641616a4cf23c4a13fa0632624b021c1b (patch) | |
| tree | 9da183258bdf9cc413f7562079d25ace6955467f /chromium/ui/gl/gl_image_io_surface.mm | |
| parent | d702e4b6a64574e97fc7df8fe3238cde70242080 (diff) | |
| download | qtwebengine-chromium-be59a35641616a4cf23c4a13fa0632624b021c1b.tar.gz | |
BASELINE: Update Chromium to 62.0.3202.101
Change-Id: I2d5eca8117600df6d331f6166ab24d943d9814ac
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/ui/gl/gl_image_io_surface.mm')
| -rw-r--r-- | chromium/ui/gl/gl_image_io_surface.mm | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/chromium/ui/gl/gl_image_io_surface.mm b/chromium/ui/gl/gl_image_io_surface.mm index c9fabee5a26..1dc5a6dbf1f 100644 --- a/chromium/ui/gl/gl_image_io_surface.mm +++ b/chromium/ui/gl/gl_image_io_surface.mm @@ -14,6 +14,7 @@ #include "base/trace_event/memory_dump_manager.h" #include "base/trace_event/process_memory_dump.h" #include "base/trace_event/trace_event.h" +#include "ui/gfx/color_space.h" #include "ui/gl/gl_bindings.h" #include "ui/gl/gl_context.h" #include "ui/gl/scoped_binders.h" @@ -298,7 +299,8 @@ bool GLImageIOSurface::CopyTexImage(unsigned target) { GLContext* gl_context = GLContext::GetCurrent(); DCHECK(gl_context); - YUVToRGBConverter* yuv_to_rgb_converter = gl_context->GetYUVToRGBConverter(); + YUVToRGBConverter* yuv_to_rgb_converter = + gl_context->GetYUVToRGBConverter(color_space_for_yuv_to_rgb_); DCHECK(yuv_to_rgb_converter); // Note that state restoration is done explicitly instead of scoped binders to @@ -405,6 +407,13 @@ bool GLImageIOSurface::CanCheckIOSurfaceIsInUse() const { return !cv_pixel_buffer_; } +void GLImageIOSurface::SetColorSpaceForYUVToRGBConversion( + const gfx::ColorSpace& color_space) { + DCHECK(color_space.IsValid()); + DCHECK_NE(color_space, color_space.GetAsFullRangeRGB()); + color_space_for_yuv_to_rgb_ = color_space; +} + base::ScopedCFTypeRef<IOSurfaceRef> GLImageIOSurface::io_surface() { return io_surface_; } |