| 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 |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/memory/shared_memory.h" | 12 #include "base/memory/shared_memory.h" |
| 13 #include "build/build_config.h" | 13 #include "build/build_config.h" |
| 14 #include "ppapi/c/dev/ppb_truetype_font_dev.h" | 14 #include "ppapi/c/dev/ppb_truetype_font_dev.h" |
| 15 #include "ppapi/c/pp_bool.h" | 15 #include "ppapi/c/pp_bool.h" |
| 16 #include "ppapi/c/pp_instance.h" | 16 #include "ppapi/c/pp_instance.h" |
| 17 #include "ppapi/c/pp_point.h" | 17 #include "ppapi/c/pp_point.h" |
| 18 #include "ppapi/c/pp_rect.h" | 18 #include "ppapi/c/pp_rect.h" |
| 19 #include "ppapi/c/ppb_network_list.h" | 19 #include "ppapi/c/ppb_network_list.h" |
| 20 #include "ppapi/c/private/ppb_net_address_private.h" | 20 #include "ppapi/c/private/ppb_net_address_private.h" |
| 21 #include "ppapi/proxy/ppapi_proxy_export.h" | 21 #include "ppapi/proxy/ppapi_proxy_export.h" |
| 22 #include "ppapi/shared_impl/host_resource.h" | 22 #include "ppapi/shared_impl/host_resource.h" |
| 23 | 23 |
| 24 class Pickle; | |
| 25 struct PP_FontDescription_Dev; | 24 struct PP_FontDescription_Dev; |
| 26 struct PP_BrowserFont_Trusted_Description; | 25 struct PP_BrowserFont_Trusted_Description; |
| 27 | 26 |
| 28 namespace ppapi { | 27 namespace ppapi { |
| 29 namespace proxy { | 28 namespace proxy { |
| 30 | 29 |
| 31 // PP_FontDescription_Dev/PP_BrowserFontDescription (same definition, different | 30 // PP_FontDescription_Dev/PP_BrowserFontDescription (same definition, different |
| 32 // names) has to be redefined with a string in place of the PP_Var used for the | 31 // names) has to be redefined with a string in place of the PP_Var used for the |
| 33 // face name. | 32 // face name. |
| 34 struct PPAPI_PROXY_EXPORT SerializedFontDescription { | 33 struct PPAPI_PROXY_EXPORT SerializedFontDescription { |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 #if defined(OS_WIN) | 135 #if defined(OS_WIN) |
| 137 typedef HANDLE ImageHandle; | 136 typedef HANDLE ImageHandle; |
| 138 #else | 137 #else |
| 139 typedef base::SharedMemoryHandle ImageHandle; | 138 typedef base::SharedMemoryHandle ImageHandle; |
| 140 #endif | 139 #endif |
| 141 | 140 |
| 142 } // namespace proxy | 141 } // namespace proxy |
| 143 } // namespace ppapi | 142 } // namespace ppapi |
| 144 | 143 |
| 145 #endif // PPAPI_PROXY_SERIALIZED_STRUCTS_H_ | 144 #endif // PPAPI_PROXY_SERIALIZED_STRUCTS_H_ |
| OLD | NEW |