Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Side by Side Diff: ui/gfx/ipc/gfx_param_traits_macros.h

Issue 1936103003: gpu traits: Move gfx::SwapResult trait to ui/gfx/ipc where it belongs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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:
View unified diff | Download patch
« no previous file with comments | « gpu/ipc/common/gpu_param_traits_macros.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/swap_result.h"
14 #include "ipc/ipc_message_macros.h" 15 #include "ipc/ipc_message_macros.h"
15 16
16 #if defined(USE_OZONE) 17 #if defined(USE_OZONE)
17 #include "ui/gfx/native_pixmap_handle_ozone.h" 18 #include "ui/gfx/native_pixmap_handle_ozone.h"
18 #endif 19 #endif
19 20
20 #undef IPC_MESSAGE_EXPORT 21 #undef IPC_MESSAGE_EXPORT
21 #define IPC_MESSAGE_EXPORT GFX_IPC_EXPORT 22 #define IPC_MESSAGE_EXPORT GFX_IPC_EXPORT
22 23
23 IPC_ENUM_TRAITS_MAX_VALUE(gfx::BufferFormat, gfx::BufferFormat::LAST) 24 IPC_ENUM_TRAITS_MAX_VALUE(gfx::BufferFormat, gfx::BufferFormat::LAST)
24 25
25 IPC_ENUM_TRAITS_MAX_VALUE(gfx::BufferUsage, gfx::BufferUsage::LAST) 26 IPC_ENUM_TRAITS_MAX_VALUE(gfx::BufferUsage, gfx::BufferUsage::LAST)
26 27
27 IPC_ENUM_TRAITS_MAX_VALUE(gfx::GpuMemoryBufferType, 28 IPC_ENUM_TRAITS_MAX_VALUE(gfx::GpuMemoryBufferType,
28 gfx::GPU_MEMORY_BUFFER_TYPE_LAST) 29 gfx::GPU_MEMORY_BUFFER_TYPE_LAST)
29 30
31 IPC_ENUM_TRAITS_MAX_VALUE(gfx::SwapResult, gfx::SwapResult::SWAP_RESULT_LAST)
32
30 IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferHandle) 33 IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferHandle)
31 IPC_STRUCT_TRAITS_MEMBER(id) 34 IPC_STRUCT_TRAITS_MEMBER(id)
32 IPC_STRUCT_TRAITS_MEMBER(type) 35 IPC_STRUCT_TRAITS_MEMBER(type)
33 IPC_STRUCT_TRAITS_MEMBER(handle) 36 IPC_STRUCT_TRAITS_MEMBER(handle)
34 IPC_STRUCT_TRAITS_MEMBER(offset) 37 IPC_STRUCT_TRAITS_MEMBER(offset)
35 IPC_STRUCT_TRAITS_MEMBER(stride) 38 IPC_STRUCT_TRAITS_MEMBER(stride)
36 #if defined(USE_OZONE) 39 #if defined(USE_OZONE)
37 IPC_STRUCT_TRAITS_MEMBER(native_pixmap_handle) 40 IPC_STRUCT_TRAITS_MEMBER(native_pixmap_handle)
38 #elif defined(OS_MACOSX) 41 #elif defined(OS_MACOSX)
39 IPC_STRUCT_TRAITS_MEMBER(mach_port) 42 IPC_STRUCT_TRAITS_MEMBER(mach_port)
40 #endif 43 #endif
41 IPC_STRUCT_TRAITS_END() 44 IPC_STRUCT_TRAITS_END()
42 45
43 IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId) 46 IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId)
44 IPC_STRUCT_TRAITS_MEMBER(id) 47 IPC_STRUCT_TRAITS_MEMBER(id)
45 IPC_STRUCT_TRAITS_END() 48 IPC_STRUCT_TRAITS_END()
46 49
47 #if defined(USE_OZONE) 50 #if defined(USE_OZONE)
48 IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapHandle) 51 IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapHandle)
49 IPC_STRUCT_TRAITS_MEMBER(fd) 52 IPC_STRUCT_TRAITS_MEMBER(fd)
50 IPC_STRUCT_TRAITS_MEMBER(stride) 53 IPC_STRUCT_TRAITS_MEMBER(stride)
51 IPC_STRUCT_TRAITS_END() 54 IPC_STRUCT_TRAITS_END()
52 #endif 55 #endif
53 56
54 #undef IPC_MESSAGE_EXPORT 57 #undef IPC_MESSAGE_EXPORT
55 #define IPC_MESSAGE_EXPORT 58 #define IPC_MESSAGE_EXPORT
56 59
57 #endif // UI_GFX_IPC_GFX_PARAM_TRAITS_MACROS_H_ 60 #endif // UI_GFX_IPC_GFX_PARAM_TRAITS_MACROS_H_
OLDNEW
« no previous file with comments | « gpu/ipc/common/gpu_param_traits_macros.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698