| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // Singly or multiply-included shared traits file depending upon circumstances. | 5 // Singly or multiply-included shared traits file depending upon circumstances. |
| 6 // This allows the use of IPC serialization macros in more than one IPC message | 6 // This allows the use of IPC serialization macros in more than one IPC message |
| 7 // file. | 7 // file. |
| 8 #ifndef UI_GFX_IPC_GFX_PARAM_TRAITS_MACROS_H_ | 8 #ifndef UI_GFX_IPC_GFX_PARAM_TRAITS_MACROS_H_ |
| 9 #define UI_GFX_IPC_GFX_PARAM_TRAITS_MACROS_H_ | 9 #define UI_GFX_IPC_GFX_PARAM_TRAITS_MACROS_H_ |
| 10 | 10 |
| 11 #include "ui/gfx/buffer_types.h" | 11 #include "ui/gfx/buffer_types.h" |
| 12 #include "ui/gfx/gpu_memory_buffer.h" | 12 #include "ui/gfx/gpu_memory_buffer.h" |
| 13 #include "ui/gfx/ipc/gfx_ipc_export.h" | 13 #include "ui/gfx/ipc/gfx_ipc_export.h" |
| 14 #include "ui/gfx/selection_bound.h" |
| 14 #include "ui/gfx/swap_result.h" | 15 #include "ui/gfx/swap_result.h" |
| 15 #include "ipc/ipc_message_macros.h" | 16 #include "ipc/ipc_message_macros.h" |
| 16 | 17 |
| 17 #if defined(USE_OZONE) | 18 #if defined(USE_OZONE) |
| 18 #include "ui/gfx/native_pixmap_handle_ozone.h" | 19 #include "ui/gfx/native_pixmap_handle_ozone.h" |
| 19 #endif | 20 #endif |
| 20 | 21 |
| 21 #undef IPC_MESSAGE_EXPORT | 22 #undef IPC_MESSAGE_EXPORT |
| 22 #define IPC_MESSAGE_EXPORT GFX_IPC_EXPORT | 23 #define IPC_MESSAGE_EXPORT GFX_IPC_EXPORT |
| 23 | 24 |
| 24 IPC_ENUM_TRAITS_MAX_VALUE(gfx::BufferFormat, gfx::BufferFormat::LAST) | 25 IPC_ENUM_TRAITS_MAX_VALUE(gfx::BufferFormat, gfx::BufferFormat::LAST) |
| 25 | 26 |
| 26 IPC_ENUM_TRAITS_MAX_VALUE(gfx::BufferUsage, gfx::BufferUsage::LAST) | 27 IPC_ENUM_TRAITS_MAX_VALUE(gfx::BufferUsage, gfx::BufferUsage::LAST) |
| 27 | 28 |
| 28 IPC_ENUM_TRAITS_MAX_VALUE(gfx::GpuMemoryBufferType, | 29 IPC_ENUM_TRAITS_MAX_VALUE(gfx::GpuMemoryBufferType, |
| 29 gfx::GPU_MEMORY_BUFFER_TYPE_LAST) | 30 gfx::GPU_MEMORY_BUFFER_TYPE_LAST) |
| 30 | 31 |
| 31 IPC_ENUM_TRAITS_MAX_VALUE(gfx::SwapResult, gfx::SwapResult::SWAP_RESULT_LAST) | 32 IPC_ENUM_TRAITS_MAX_VALUE(gfx::SwapResult, gfx::SwapResult::SWAP_RESULT_LAST) |
| 32 | 33 |
| 34 IPC_ENUM_TRAITS_MAX_VALUE(gfx::SelectionBound::Type, gfx::SelectionBound::LAST); |
| 35 |
| 33 IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferHandle) | 36 IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferHandle) |
| 34 IPC_STRUCT_TRAITS_MEMBER(id) | 37 IPC_STRUCT_TRAITS_MEMBER(id) |
| 35 IPC_STRUCT_TRAITS_MEMBER(type) | 38 IPC_STRUCT_TRAITS_MEMBER(type) |
| 36 IPC_STRUCT_TRAITS_MEMBER(handle) | 39 IPC_STRUCT_TRAITS_MEMBER(handle) |
| 37 IPC_STRUCT_TRAITS_MEMBER(offset) | 40 IPC_STRUCT_TRAITS_MEMBER(offset) |
| 38 IPC_STRUCT_TRAITS_MEMBER(stride) | 41 IPC_STRUCT_TRAITS_MEMBER(stride) |
| 39 #if defined(USE_OZONE) | 42 #if defined(USE_OZONE) |
| 40 IPC_STRUCT_TRAITS_MEMBER(native_pixmap_handle) | 43 IPC_STRUCT_TRAITS_MEMBER(native_pixmap_handle) |
| 41 #elif defined(OS_MACOSX) | 44 #elif defined(OS_MACOSX) |
| 42 IPC_STRUCT_TRAITS_MEMBER(mach_port) | 45 IPC_STRUCT_TRAITS_MEMBER(mach_port) |
| 43 #endif | 46 #endif |
| 44 IPC_STRUCT_TRAITS_END() | 47 IPC_STRUCT_TRAITS_END() |
| 45 | 48 |
| 46 IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId) | 49 IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId) |
| 47 IPC_STRUCT_TRAITS_MEMBER(id) | 50 IPC_STRUCT_TRAITS_MEMBER(id) |
| 48 IPC_STRUCT_TRAITS_END() | 51 IPC_STRUCT_TRAITS_END() |
| 49 | 52 |
| 50 #if defined(USE_OZONE) | 53 #if defined(USE_OZONE) |
| 51 IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapHandle) | 54 IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapHandle) |
| 52 IPC_STRUCT_TRAITS_MEMBER(fds) | 55 IPC_STRUCT_TRAITS_MEMBER(fds) |
| 53 IPC_STRUCT_TRAITS_MEMBER(strides) | 56 IPC_STRUCT_TRAITS_MEMBER(strides) |
| 54 IPC_STRUCT_TRAITS_END() | 57 IPC_STRUCT_TRAITS_END() |
| 55 #endif | 58 #endif |
| 56 | 59 |
| 57 #undef IPC_MESSAGE_EXPORT | 60 #undef IPC_MESSAGE_EXPORT |
| 58 #define IPC_MESSAGE_EXPORT | 61 #define IPC_MESSAGE_EXPORT |
| 59 | 62 |
| 60 #endif // UI_GFX_IPC_GFX_PARAM_TRAITS_MACROS_H_ | 63 #endif // UI_GFX_IPC_GFX_PARAM_TRAITS_MACROS_H_ |
| OLD | NEW |