OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #ifndef PPAPI_PROXY_SERIALIZED_STRUCTS_H_ | 5 #ifndef PPAPI_PROXY_SERIALIZED_STRUCTS_H_ |
6 #define PPAPI_PROXY_SERIALIZED_STRUCTS_H_ | 6 #define PPAPI_PROXY_SERIALIZED_STRUCTS_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
112 }; | 112 }; |
113 | 113 |
114 struct PPPDecryptor_Buffer { | 114 struct PPPDecryptor_Buffer { |
115 ppapi::HostResource resource; | 115 ppapi::HostResource resource; |
116 uint32_t size; | 116 uint32_t size; |
117 base::SharedMemoryHandle handle; | 117 base::SharedMemoryHandle handle; |
118 }; | 118 }; |
119 | 119 |
120 #if defined(OS_WIN) | 120 #if defined(OS_WIN) |
121 typedef HANDLE ImageHandle; | 121 typedef HANDLE ImageHandle; |
122 #elif defined(OS_MACOSX) || defined(OS_ANDROID) | 122 #elif defined(TOOLKIT_GTK) |
| 123 // On legacy X Windows this is a SysV shared memory key. |
| 124 typedef int ImageHandle; |
| 125 #else |
123 typedef base::SharedMemoryHandle ImageHandle; | 126 typedef base::SharedMemoryHandle ImageHandle; |
124 #else | |
125 // On X Windows this is a SysV shared memory key. | |
126 typedef int ImageHandle; | |
127 #endif | 127 #endif |
128 | 128 |
129 } // namespace proxy | 129 } // namespace proxy |
130 } // namespace ppapi | 130 } // namespace ppapi |
131 | 131 |
132 #endif // PPAPI_PROXY_SERIALIZED_STRUCTS_H_ | 132 #endif // PPAPI_PROXY_SERIALIZED_STRUCTS_H_ |
OLD | NEW |