diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-16 11:45:35 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-17 08:59:23 +0000 |
| commit | 552906b0f222c5d5dd11b9fd73829d510980461a (patch) | |
| tree | 3a11e6ed0538a81dd83b20cf3a4783e297f26d91 /chromium/third_party/blink/renderer/modules/imagecapture/image_capture_frame_grabber.cc | |
| parent | 1b05827804eaf047779b597718c03e7d38344261 (diff) | |
| download | qtwebengine-chromium-552906b0f222c5d5dd11b9fd73829d510980461a.tar.gz | |
BASELINE: Update Chromium to 83.0.4103.122
Change-Id: Ie3a82f5bb0076eec2a7c6a6162326b4301ee291e
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/modules/imagecapture/image_capture_frame_grabber.cc')
| -rw-r--r-- | chromium/third_party/blink/renderer/modules/imagecapture/image_capture_frame_grabber.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chromium/third_party/blink/renderer/modules/imagecapture/image_capture_frame_grabber.cc b/chromium/third_party/blink/renderer/modules/imagecapture/image_capture_frame_grabber.cc index c0b3f881b0e..dfc36212876 100644 --- a/chromium/third_party/blink/renderer/modules/imagecapture/image_capture_frame_grabber.cc +++ b/chromium/third_party/blink/renderer/modules/imagecapture/image_capture_frame_grabber.cc @@ -107,9 +107,11 @@ void ImageCaptureFrameGrabber::SingleShotFrameHandler::OnVideoFrameOnIOThread( return; } - const uint32_t destination_pixel_format = - (kN32_SkColorType == kRGBA_8888_SkColorType) ? libyuv::FOURCC_ABGR - : libyuv::FOURCC_ARGB; +#if SK_PMCOLOR_BYTE_ORDER(R, G, B, A) + const uint32_t destination_pixel_format = libyuv::FOURCC_ABGR; +#else + const uint32_t destination_pixel_format = libyuv::FOURCC_ARGB; +#endif uint8_t* destination_plane = static_cast<uint8_t*>(pixmap.writable_addr()); int destination_stride = pixmap.width() * 4; int destination_width = pixmap.width(); |