| OLD | NEW | 
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_THUNK_THUNK_H_ | 5 #ifndef PPAPI_THUNK_THUNK_H_ | 
| 6 #define PPAPI_THUNK_THUNK_H_ | 6 #define PPAPI_THUNK_THUNK_H_ | 
| 7 | 7 | 
|  | 8 #include "ppapi/c/ppb_graphics_3d.h" | 
|  | 9 #include "ppapi/c/private/ppb_flash_clipboard.h" | 
|  | 10 #include "ppapi/c/private/ppb_flash_menu.h" | 
|  | 11 #include "ppapi/c/private/ppb_flash_net_connector.h" | 
|  | 12 #include "ppapi/c/private/ppb_flash_fullscreen.h" | 
|  | 13 #include "ppapi/c/private/ppb_instance_private.h" | 
|  | 14 #include "ppapi/c/private/ppb_tcp_socket_private.h" | 
|  | 15 #include "ppapi/c/private/ppb_udp_socket_private.h" | 
|  | 16 #include "ppapi/c/trusted/ppb_audio_input_trusted_dev.h" | 
|  | 17 #include "ppapi/c/trusted/ppb_audio_trusted.h" | 
|  | 18 #include "ppapi/c/trusted/ppb_broker_trusted.h" | 
|  | 19 #include "ppapi/c/trusted/ppb_buffer_trusted.h" | 
|  | 20 #include "ppapi/c/trusted/ppb_file_chooser_trusted.h" | 
|  | 21 #include "ppapi/c/trusted/ppb_graphics_3d_trusted.h" | 
|  | 22 #include "ppapi/c/trusted/ppb_image_data_trusted.h" | 
|  | 23 #include "ppapi/c/trusted/ppb_url_loader_trusted.h" | 
| 8 #include "ppapi/thunk/ppapi_thunk_export.h" | 24 #include "ppapi/thunk/ppapi_thunk_export.h" | 
| 9 | 25 | 
| 10 // Declares a getter for the interface thunk of the form: | 26 // Declares a getter for the interface thunk of the form: | 
| 11 // | 27 // | 
| 12 //   const PPB_Foo* ppapi::thunk::GetPPB_Foo_Thunk(); | 28 //   const PPB_Foo* ppapi::thunk::GetPPB_Foo_Thunk(); | 
| 13 // | 29 // | 
| 14 #define IFACE(api_name, interface_name, InterfaceType) \ | 30 #define IFACE(api_name, interface_name, InterfaceType) \ | 
| 15   struct InterfaceType; \ | 31   struct InterfaceType; \ | 
| 16   namespace ppapi { namespace thunk { \ | 32   namespace ppapi { namespace thunk { \ | 
| 17   PPAPI_THUNK_EXPORT const InterfaceType* Get##InterfaceType##_Thunk(); \ | 33   PPAPI_THUNK_EXPORT const InterfaceType* Get##InterfaceType##_Thunk(); \ | 
| 18   } } | 34   } } | 
| 19 #define PROXIED_IFACE IFACE | 35 #define PROXIED_IFACE IFACE | 
| 20 #define UNPROXIED_IFACE IFACE | 36 #define UNPROXIED_IFACE IFACE | 
| 21 | 37 | 
| 22 #include "ppapi/thunk/interfaces_ppb_private.h" | 38 #include "ppapi/thunk/interfaces_ppb_private.h" | 
| 23 #include "ppapi/thunk/interfaces_ppb_public_stable.h" | 39 #include "ppapi/thunk/interfaces_ppb_public_stable.h" | 
| 24 #include "ppapi/thunk/interfaces_ppb_public_dev.h" | 40 #include "ppapi/thunk/interfaces_ppb_public_dev.h" | 
| 25 | 41 | 
| 26 #undef UNPROXIED_IFACE | 42 #undef UNPROXIED_IFACE | 
| 27 #undef PROXIED_IFACE | 43 #undef PROXIED_IFACE | 
| 28 #undef IFACE | 44 #undef IFACE | 
| 29 | 45 | 
| 30 struct PPB_AudioInputTrusted_Dev; |  | 
| 31 struct PPB_AudioTrusted; |  | 
| 32 struct PPB_BrokerTrusted; |  | 
| 33 struct PPB_BufferTrusted; |  | 
| 34 struct PPB_FileChooserTrusted; |  | 
| 35 struct PPB_Flash_Clipboard; |  | 
| 36 struct PPB_Flash_Menu; |  | 
| 37 struct PPB_Flash_NetConnector; |  | 
| 38 struct PPB_Graphics3D; |  | 
| 39 struct PPB_Graphics3DTrusted; |  | 
| 40 struct PPB_ImageDataTrusted; |  | 
| 41 struct PPB_Instance_Private; |  | 
| 42 struct PPB_TCPSocket_Private; |  | 
| 43 struct PPB_UDPSocket_Private; |  | 
| 44 struct PPB_URLLoaderTrusted; |  | 
| 45 |  | 
| 46 namespace ppapi { | 46 namespace ppapi { | 
| 47 namespace thunk { | 47 namespace thunk { | 
| 48 | 48 | 
| 49 // Old-style thunk getters. Only put trusted/private stuff here (it hasn't | 49 // Old-style thunk getters. Only put trusted/private stuff here (it hasn't | 
| 50 // yet been converted to the new system). Otherwise, add the declaration to | 50 // yet been converted to the new system). Otherwise, add the declaration to | 
| 51 // the appropriate interfaces_*.h file. | 51 // the appropriate interfaces_*.h file. | 
| 52 PPAPI_THUNK_EXPORT const PPB_AudioInputTrusted_Dev* | 52 PPAPI_THUNK_EXPORT const PPB_AudioInputTrusted_Dev_0_1* | 
| 53     GetPPB_AudioInputTrusted_Thunk(); | 53     GetPPB_AudioInputTrusted_0_1_Thunk(); | 
| 54 PPAPI_THUNK_EXPORT const PPB_AudioTrusted* GetPPB_AudioTrusted_Thunk(); | 54 PPAPI_THUNK_EXPORT const PPB_AudioTrusted_0_6* GetPPB_AudioTrusted_0_6_Thunk(); | 
| 55 PPAPI_THUNK_EXPORT const PPB_BrokerTrusted* GetPPB_Broker_Thunk(); | 55 PPAPI_THUNK_EXPORT const PPB_BrokerTrusted_0_2* GetPPB_Broker_0_2_Thunk(); | 
| 56 PPAPI_THUNK_EXPORT const PPB_BufferTrusted* GetPPB_BufferTrusted_Thunk(); | 56 PPAPI_THUNK_EXPORT const PPB_BufferTrusted_0_1* | 
| 57 PPAPI_THUNK_EXPORT const PPB_FileChooserTrusted* | 57     GetPPB_BufferTrusted_0_1_Thunk(); | 
| 58     GetPPB_FileChooser_Trusted_Thunk(); | 58 PPAPI_THUNK_EXPORT const PPB_FileChooserTrusted_0_5* | 
| 59 PPAPI_THUNK_EXPORT const PPB_Flash_Clipboard* GetPPB_Flash_Clipboard_Thunk(); | 59     GetPPB_FileChooser_Trusted_0_5_Thunk(); | 
| 60 PPAPI_THUNK_EXPORT const PPB_Flash_Menu* GetPPB_Flash_Menu_Thunk(); | 60 PPAPI_THUNK_EXPORT const PPB_Flash_Clipboard_3_0* | 
| 61 PPAPI_THUNK_EXPORT const PPB_Flash_NetConnector* | 61     GetPPB_Flash_Clipboard_3_0_Thunk(); | 
| 62     GetPPB_Flash_NetConnector_Thunk(); | 62 PPAPI_THUNK_EXPORT const PPB_Flash_Menu_0_2* GetPPB_Flash_Menu_0_2_Thunk(); | 
| 63 PPAPI_THUNK_EXPORT const PPB_Graphics3DTrusted* | 63 PPAPI_THUNK_EXPORT const PPB_Flash_NetConnector_0_2* | 
| 64     GetPPB_Graphics3DTrusted_Thunk(); | 64     GetPPB_Flash_NetConnector_0_2_Thunk(); | 
| 65 PPAPI_THUNK_EXPORT const PPB_ImageDataTrusted* GetPPB_ImageDataTrusted_Thunk(); | 65 PPAPI_THUNK_EXPORT const PPB_Graphics3DTrusted_1_0* | 
| 66 PPAPI_THUNK_EXPORT const PPB_Instance_Private* GetPPB_Instance_Private_Thunk(); | 66     GetPPB_Graphics3DTrusted_1_0_Thunk(); | 
| 67 PPAPI_THUNK_EXPORT const PPB_TCPSocket_Private* | 67 PPAPI_THUNK_EXPORT const PPB_ImageDataTrusted_0_4* | 
| 68     GetPPB_TCPSocket_Private_Thunk(); | 68     GetPPB_ImageDataTrusted_0_4_Thunk(); | 
| 69 PPAPI_THUNK_EXPORT const PPB_UDPSocket_Private* | 69 PPAPI_THUNK_EXPORT const PPB_Instance_Private_0_1* | 
| 70     GetPPB_UDPSocket_Private_Thunk(); | 70     GetPPB_Instance_Private_0_1_Thunk(); | 
| 71 PPAPI_THUNK_EXPORT const PPB_URLLoaderTrusted* GetPPB_URLLoaderTrusted_Thunk(); | 71 PPAPI_THUNK_EXPORT const PPB_TCPSocket_Private_0_3* | 
|  | 72     GetPPB_TCPSocket_Private_0_3_Thunk(); | 
|  | 73 PPAPI_THUNK_EXPORT const PPB_UDPSocket_Private_0_2* | 
|  | 74     GetPPB_UDPSocket_Private_0_2_Thunk(); | 
|  | 75 PPAPI_THUNK_EXPORT const PPB_URLLoaderTrusted_0_3* | 
|  | 76     GetPPB_URLLoaderTrusted_0_3_Thunk(); | 
| 72 | 77 | 
| 73 }  // namespace thunk | 78 }  // namespace thunk | 
| 74 }  // namespace ppapi | 79 }  // namespace ppapi | 
| 75 | 80 | 
| 76 #endif  // PPAPI_THUNK_THUNK_H_ | 81 #endif  // PPAPI_THUNK_THUNK_H_ | 
| OLD | NEW | 
|---|