1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
--- ui/gfx/native_pixmap_handle.cc.orig 2020-02-24 18:39:44 UTC
+++ ui/gfx/native_pixmap_handle.cc
@@ -8,11 +8,15 @@
#include "build/build_config.h"
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include <drm_fourcc.h>
#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(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
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;
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
|
