ui/gfx/ipc/gfx_param_traits_macros.h - Issue 2683593006: Use OS_LINUX instead of USE_OZONE in ui/gfx/ when possible

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gfx/ipc/gfx_param_traits_macros.h

Issue 2683593006: Use OS_LINUX instead of USE_OZONE in ui/gfx/ when possible (Closed)

Patch Set: Rebase Created 3 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ui/gfx/ipc/gfx_param_traits_macros.h

diff --git a/ui/gfx/ipc/gfx_param_traits_macros.h b/ui/gfx/ipc/gfx_param_traits_macros.h

index cdee2f6ba3644c78ccd82e57701ef7467bec3364..0001851212e3455c7e81add4c2797544693acdc4 100644

--- a/ui/gfx/ipc/gfx_param_traits_macros.h

+++ b/ui/gfx/ipc/gfx_param_traits_macros.h

@@ -15,7 +15,7 @@

#include "ui/gfx/selection_bound.h"

#include "ui/gfx/swap_result.h"

-#if defined(USE_OZONE)

+#if defined(OS_LINUX)

#include "ui/gfx/native_pixmap_handle.h"

#endif

@@ -39,7 +39,7 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferHandle)

IPC_STRUCT_TRAITS_MEMBER(handle)

IPC_STRUCT_TRAITS_MEMBER(offset)

IPC_STRUCT_TRAITS_MEMBER(stride)

-#if defined(USE_OZONE)

+#if defined(OS_LINUX)

IPC_STRUCT_TRAITS_MEMBER(native_pixmap_handle)

#elif defined(OS_MACOSX)

IPC_STRUCT_TRAITS_MEMBER(mach_port)

@@ -50,7 +50,7 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId)

IPC_STRUCT_TRAITS_MEMBER(id)

IPC_STRUCT_TRAITS_END()

-#if defined(USE_OZONE)

+#if defined(OS_LINUX)

IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapPlane)

IPC_STRUCT_TRAITS_MEMBER(stride)

IPC_STRUCT_TRAITS_MEMBER(offset)

« no previous file with comments | « ui/gfx/gpu_memory_buffer.cc ('k') | ui/gfx/mojo/buffer_types_struct_traits.h » ('j') | no next file with comments »