diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2020-07-23 16:31:18 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2020-07-23 16:31:18 +0000 |
| commit | 651302b592fe54c5197641402df87ff216c27903 (patch) | |
| tree | 784a10fc6050d3be8786fd6f4f954d7802bd9204 /www/iridium/files/patch-ui_gfx_native__pixmap__handle.cc | |
| parent | Add compiler:c++14-lang to USES to atttempt to fix on GCC-based systems: (diff) | |
www/iridium: update to 2020.04.81
PR: 245959
Submitted by: Matthias Wolf
MFH: 2020Q3
Security: any Chromium vulnerability between 73 and 81
Diffstat (limited to 'www/iridium/files/patch-ui_gfx_native__pixmap__handle.cc')
| -rw-r--r-- | www/iridium/files/patch-ui_gfx_native__pixmap__handle.cc | 56 |
1 files changed, 46 insertions, 10 deletions
diff --git a/www/iridium/files/patch-ui_gfx_native__pixmap__handle.cc b/www/iridium/files/patch-ui_gfx_native__pixmap__handle.cc index 2d50ce0b11f4..20952718c93d 100644 --- a/www/iridium/files/patch-ui_gfx_native__pixmap__handle.cc +++ b/www/iridium/files/patch-ui_gfx_native__pixmap__handle.cc @@ -1,8 +1,8 @@ ---- ui/gfx/native_pixmap_handle.cc.orig 2019-03-11 22:01:19 UTC +--- ui/gfx/native_pixmap_handle.cc.orig 2020-02-24 18:39:44 UTC +++ ui/gfx/native_pixmap_handle.cc -@@ -4,14 +4,14 @@ +@@ -8,11 +8,15 @@ - #include "ui/gfx/native_pixmap_handle.h" + #include "build/build_config.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) @@ -10,19 +10,55 @@ #include "base/posix/eintr_wrapper.h" #endif ++#if defined(OS_BSD) ++#include <unistd.h> ++#endif ++ + #if defined(OS_FUCHSIA) + #include <lib/zx/vmo.h> + #include "base/fuchsia/fuchsia_logging.h" +@@ -20,7 +24,7 @@ + namespace gfx { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - static_assert(NativePixmapPlane::kNoModifier == DRM_FORMAT_MOD_INVALID, - "gfx::NativePixmapPlane::kNoModifier should be an alias for" + static_assert(NativePixmapHandle::kNoModifier == DRM_FORMAT_MOD_INVALID, + "gfx::NativePixmapHandle::kNoModifier should be an alias for" "DRM_FORMAT_MOD_INVALID"); -@@ -36,7 +36,7 @@ NativePixmapHandle::NativePixmapHandle(const NativePix - - NativePixmapHandle::~NativePixmapHandle() {} - +@@ -31,7 +35,7 @@ NativePixmapPlane::NativePixmapPlane() : stride(0), of + NativePixmapPlane::NativePixmapPlane(int stride, + int offset, + uint64_t size -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) + , + base::ScopedFD fd + #elif defined(OS_FUCHSIA) +@@ -42,7 +46,7 @@ NativePixmapPlane::NativePixmapPlane(int stride, + : stride(stride), + offset(offset), + size(size) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + , + fd(std::move(fd)) + #elif defined(OS_FUCHSIA) +@@ -70,7 +74,7 @@ NativePixmapHandle& NativePixmapHandle::operator=(Nati NativePixmapHandle CloneHandleForIPC(const NativePixmapHandle& handle) { NativePixmapHandle clone; - std::vector<base::ScopedFD> scoped_fds; + for (auto& plane : handle.planes) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + DCHECK(plane.fd.is_valid()); + base::ScopedFD fd_dup(HANDLE_EINTR(dup(plane.fd.get()))); + if (!fd_dup.is_valid()) { +@@ -96,7 +100,7 @@ NativePixmapHandle CloneHandleForIPC(const NativePixma + #endif + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + clone.modifier = handle.modifier; + #endif + |