| 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 "ipc/ipc_message_macros.h" | 11 #include "ipc/ipc_message_macros.h" |
| 12 #include "ui/gfx/buffer_types.h" | 12 #include "ui/gfx/buffer_types.h" |
| 13 #include "ui/gfx/gpu_fence.h" |
| 13 #include "ui/gfx/gpu_memory_buffer.h" | 14 #include "ui/gfx/gpu_memory_buffer.h" |
| 14 #include "ui/gfx/ipc/gfx_ipc_export.h" | 15 #include "ui/gfx/ipc/gfx_ipc_export.h" |
| 15 #include "ui/gfx/selection_bound.h" | 16 #include "ui/gfx/selection_bound.h" |
| 16 #include "ui/gfx/swap_result.h" | 17 #include "ui/gfx/swap_result.h" |
| 17 | 18 |
| 18 #if defined(USE_OZONE) | 19 #if defined(USE_OZONE) |
| 19 #include "ui/gfx/native_pixmap_handle.h" | 20 #include "ui/gfx/native_pixmap_handle.h" |
| 20 #endif | 21 #endif |
| 21 | 22 |
| 22 #undef IPC_MESSAGE_EXPORT | 23 #undef IPC_MESSAGE_EXPORT |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 IPC_STRUCT_TRAITS_MEMBER(size) | 58 IPC_STRUCT_TRAITS_MEMBER(size) |
| 58 IPC_STRUCT_TRAITS_MEMBER(modifier) | 59 IPC_STRUCT_TRAITS_MEMBER(modifier) |
| 59 IPC_STRUCT_TRAITS_END() | 60 IPC_STRUCT_TRAITS_END() |
| 60 | 61 |
| 61 IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapHandle) | 62 IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapHandle) |
| 62 IPC_STRUCT_TRAITS_MEMBER(fds) | 63 IPC_STRUCT_TRAITS_MEMBER(fds) |
| 63 IPC_STRUCT_TRAITS_MEMBER(planes) | 64 IPC_STRUCT_TRAITS_MEMBER(planes) |
| 64 IPC_STRUCT_TRAITS_END() | 65 IPC_STRUCT_TRAITS_END() |
| 65 #endif | 66 #endif |
| 66 | 67 |
| 68 IPC_STRUCT_TRAITS_BEGIN(gfx::GpuFenceHandle) |
| 69 IPC_STRUCT_TRAITS_MEMBER(shared_event_handle) |
| 70 IPC_STRUCT_TRAITS_END() |
| 71 |
| 67 #undef IPC_MESSAGE_EXPORT | 72 #undef IPC_MESSAGE_EXPORT |
| 68 #define IPC_MESSAGE_EXPORT | 73 #define IPC_MESSAGE_EXPORT |
| 69 | 74 |
| 70 #endif // UI_GFX_IPC_GFX_PARAM_TRAITS_MACROS_H_ | 75 #endif // UI_GFX_IPC_GFX_PARAM_TRAITS_MACROS_H_ |
| OLD | NEW |