| 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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 // TODO(raymes): Make ImageHandle compatible with SerializedHandle. | 120 // TODO(raymes): Make ImageHandle compatible with SerializedHandle. |
| 121 #if defined(OS_WIN) | 121 #if defined(OS_WIN) |
| 122 typedef HANDLE ImageHandle; | 122 typedef HANDLE ImageHandle; |
| 123 #elif defined(OS_MACOSX) || defined(OS_ANDROID) | 123 #elif defined(TOOLKIT_GTK) |
| 124 // On legacy X Windows this is a SysV shared memory key. |
| 125 typedef int ImageHandle; |
| 126 #else |
| 124 typedef base::SharedMemoryHandle ImageHandle; | 127 typedef base::SharedMemoryHandle ImageHandle; |
| 125 #else | |
| 126 // On X Windows this is a SysV shared memory key. | |
| 127 typedef int ImageHandle; | |
| 128 #endif | 128 #endif |
| 129 | 129 |
| 130 } // namespace proxy | 130 } // namespace proxy |
| 131 } // namespace ppapi | 131 } // namespace ppapi |
| 132 | 132 |
| 133 #endif // PPAPI_PROXY_SERIALIZED_STRUCTS_H_ | 133 #endif // PPAPI_PROXY_SERIALIZED_STRUCTS_H_ |
| OLD | NEW |