diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2020-07-30 20:39:39 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2020-07-30 20:39:39 +0000 |
| commit | 2dd4dd29c063a32031fb5549616ba28e76310f0a (patch) | |
| tree | 0427b26fe2d2bae71ff47102b5e646fdf927c022 /www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc | |
| parent | devel/cdecl: update to 8.0. (diff) | |
www/chromium: update to 84.0.4147.105
Submitted by: Matthias Wolf via GitHub
MFH: 2020Q3
Security: http://vuxml.freebsd.org/freebsd/9a447f78-d0f8-11ea-9837-e09467587c17.html
Security: http://vuxml.freebsd.org/freebsd/870d59b0-c6c4-11ea-8015-e09467587c17.html
Diffstat (limited to 'www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc')
| -rw-r--r-- | www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc index 20952718c93d..e4128cb160c5 100644 --- a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc +++ b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc @@ -1,7 +1,7 @@ ---- ui/gfx/native_pixmap_handle.cc.orig 2020-02-24 18:39:44 UTC +--- ui/gfx/native_pixmap_handle.cc.orig 2020-07-07 21:57:59 UTC +++ ui/gfx/native_pixmap_handle.cc -@@ -8,11 +8,15 @@ - +@@ -9,11 +9,15 @@ + #include "base/logging.h" #include "build/build_config.h" -#if defined(OS_LINUX) @@ -17,7 +17,7 @@ #if defined(OS_FUCHSIA) #include <lib/zx/vmo.h> #include "base/fuchsia/fuchsia_logging.h" -@@ -20,7 +24,7 @@ +@@ -21,7 +25,7 @@ namespace gfx { @@ -26,7 +26,7 @@ static_assert(NativePixmapHandle::kNoModifier == DRM_FORMAT_MOD_INVALID, "gfx::NativePixmapHandle::kNoModifier should be an alias for" "DRM_FORMAT_MOD_INVALID"); -@@ -31,7 +35,7 @@ NativePixmapPlane::NativePixmapPlane() : stride(0), of +@@ -32,7 +36,7 @@ NativePixmapPlane::NativePixmapPlane() : stride(0), of NativePixmapPlane::NativePixmapPlane(int stride, int offset, uint64_t size @@ -35,7 +35,7 @@ , base::ScopedFD fd #elif defined(OS_FUCHSIA) -@@ -42,7 +46,7 @@ NativePixmapPlane::NativePixmapPlane(int stride, +@@ -43,7 +47,7 @@ NativePixmapPlane::NativePixmapPlane(int stride, : stride(stride), offset(offset), size(size) @@ -44,7 +44,7 @@ , fd(std::move(fd)) #elif defined(OS_FUCHSIA) -@@ -70,7 +74,7 @@ NativePixmapHandle& NativePixmapHandle::operator=(Nati +@@ -71,7 +75,7 @@ NativePixmapHandle& NativePixmapHandle::operator=(Nati NativePixmapHandle CloneHandleForIPC(const NativePixmapHandle& handle) { NativePixmapHandle clone; for (auto& plane : handle.planes) { @@ -53,7 +53,7 @@ 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 +@@ -97,7 +101,7 @@ NativePixmapHandle CloneHandleForIPC(const NativePixma #endif } |