diff options
Diffstat (limited to 'www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h')
| -rw-r--r-- | www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h index 7f3980dd22e3..53f92778433b 100644 --- a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h +++ b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h @@ -1,18 +1,18 @@ ---- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2020-05-15 15:29:45 UTC +--- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2020-11-13 06:37:06 UTC +++ ui/gfx/mojom/native_handle_types_mojom_traits.h @@ -14,13 +14,13 @@ #include "mojo/public/cpp/system/platform_handle.h" #include "ui/gfx/mojom/native_handle_types.mojom-shared.h" --#if defined(OS_LINUX) || defined(USE_OZONE) -+#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || defined(USE_OZONE) #include "ui/gfx/native_pixmap_handle.h" #endif namespace mojo { --#if defined(OS_LINUX) || defined(USE_OZONE) -+#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || defined(USE_OZONE) template <> struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED_MOJOM_TRAITS) StructTraits<gfx::mojom::NativePixmapPlaneDataView, @@ -20,8 +20,8 @@ return pixmap_handle.planes; } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_CHROMEOS) static uint64_t modifier(const gfx::NativePixmapHandle& pixmap_handle) { return pixmap_handle.modifier; } @@ -29,8 +29,8 @@ static bool Read(gfx::mojom::NativePixmapHandleDataView data, gfx::NativePixmapHandle* out); }; --#endif // defined(OS_LINUX) || defined(USE_OZONE) -+#endif // defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || defined(USE_OZONE) } // namespace mojo |