| Index: ppapi/thunk/thunk.h
|
| diff --git a/ppapi/thunk/thunk.h b/ppapi/thunk/thunk.h
|
| index a6a6ebb63fcf40439f0b404e6ba2ae2be7d1f706..a3c92e576ee70e45cf3bbefab56e18970225ba00 100644
|
| --- a/ppapi/thunk/thunk.h
|
| +++ b/ppapi/thunk/thunk.h
|
| @@ -5,6 +5,22 @@
|
| #ifndef PPAPI_THUNK_THUNK_H_
|
| #define PPAPI_THUNK_THUNK_H_
|
|
|
| +#include "ppapi/c/ppb_graphics_3d.h"
|
| +#include "ppapi/c/private/ppb_flash_clipboard.h"
|
| +#include "ppapi/c/private/ppb_flash_menu.h"
|
| +#include "ppapi/c/private/ppb_flash_net_connector.h"
|
| +#include "ppapi/c/private/ppb_flash_fullscreen.h"
|
| +#include "ppapi/c/private/ppb_instance_private.h"
|
| +#include "ppapi/c/private/ppb_tcp_socket_private.h"
|
| +#include "ppapi/c/private/ppb_udp_socket_private.h"
|
| +#include "ppapi/c/trusted/ppb_audio_input_trusted_dev.h"
|
| +#include "ppapi/c/trusted/ppb_audio_trusted.h"
|
| +#include "ppapi/c/trusted/ppb_broker_trusted.h"
|
| +#include "ppapi/c/trusted/ppb_buffer_trusted.h"
|
| +#include "ppapi/c/trusted/ppb_file_chooser_trusted.h"
|
| +#include "ppapi/c/trusted/ppb_graphics_3d_trusted.h"
|
| +#include "ppapi/c/trusted/ppb_image_data_trusted.h"
|
| +#include "ppapi/c/trusted/ppb_url_loader_trusted.h"
|
| #include "ppapi/thunk/ppapi_thunk_export.h"
|
|
|
| // Declares a getter for the interface thunk of the form:
|
| @@ -27,48 +43,37 @@
|
| #undef PROXIED_IFACE
|
| #undef IFACE
|
|
|
| -struct PPB_AudioInputTrusted_Dev;
|
| -struct PPB_AudioTrusted;
|
| -struct PPB_BrokerTrusted;
|
| -struct PPB_BufferTrusted;
|
| -struct PPB_FileChooserTrusted;
|
| -struct PPB_Flash_Clipboard;
|
| -struct PPB_Flash_Menu;
|
| -struct PPB_Flash_NetConnector;
|
| -struct PPB_Graphics3D;
|
| -struct PPB_Graphics3DTrusted;
|
| -struct PPB_ImageDataTrusted;
|
| -struct PPB_Instance_Private;
|
| -struct PPB_TCPSocket_Private;
|
| -struct PPB_UDPSocket_Private;
|
| -struct PPB_URLLoaderTrusted;
|
| -
|
| namespace ppapi {
|
| namespace thunk {
|
|
|
| // Old-style thunk getters. Only put trusted/private stuff here (it hasn't
|
| // yet been converted to the new system). Otherwise, add the declaration to
|
| // the appropriate interfaces_*.h file.
|
| -PPAPI_THUNK_EXPORT const PPB_AudioInputTrusted_Dev*
|
| - GetPPB_AudioInputTrusted_Thunk();
|
| -PPAPI_THUNK_EXPORT const PPB_AudioTrusted* GetPPB_AudioTrusted_Thunk();
|
| -PPAPI_THUNK_EXPORT const PPB_BrokerTrusted* GetPPB_Broker_Thunk();
|
| -PPAPI_THUNK_EXPORT const PPB_BufferTrusted* GetPPB_BufferTrusted_Thunk();
|
| -PPAPI_THUNK_EXPORT const PPB_FileChooserTrusted*
|
| - GetPPB_FileChooser_Trusted_Thunk();
|
| -PPAPI_THUNK_EXPORT const PPB_Flash_Clipboard* GetPPB_Flash_Clipboard_Thunk();
|
| -PPAPI_THUNK_EXPORT const PPB_Flash_Menu* GetPPB_Flash_Menu_Thunk();
|
| -PPAPI_THUNK_EXPORT const PPB_Flash_NetConnector*
|
| - GetPPB_Flash_NetConnector_Thunk();
|
| -PPAPI_THUNK_EXPORT const PPB_Graphics3DTrusted*
|
| - GetPPB_Graphics3DTrusted_Thunk();
|
| -PPAPI_THUNK_EXPORT const PPB_ImageDataTrusted* GetPPB_ImageDataTrusted_Thunk();
|
| -PPAPI_THUNK_EXPORT const PPB_Instance_Private* GetPPB_Instance_Private_Thunk();
|
| -PPAPI_THUNK_EXPORT const PPB_TCPSocket_Private*
|
| - GetPPB_TCPSocket_Private_Thunk();
|
| -PPAPI_THUNK_EXPORT const PPB_UDPSocket_Private*
|
| - GetPPB_UDPSocket_Private_Thunk();
|
| -PPAPI_THUNK_EXPORT const PPB_URLLoaderTrusted* GetPPB_URLLoaderTrusted_Thunk();
|
| +PPAPI_THUNK_EXPORT const PPB_AudioInputTrusted_Dev_0_1*
|
| + GetPPB_AudioInputTrusted_0_1_Thunk();
|
| +PPAPI_THUNK_EXPORT const PPB_AudioTrusted_0_6* GetPPB_AudioTrusted_0_6_Thunk();
|
| +PPAPI_THUNK_EXPORT const PPB_BrokerTrusted_0_2* GetPPB_Broker_0_2_Thunk();
|
| +PPAPI_THUNK_EXPORT const PPB_BufferTrusted_0_1*
|
| + GetPPB_BufferTrusted_0_1_Thunk();
|
| +PPAPI_THUNK_EXPORT const PPB_FileChooserTrusted_0_5*
|
| + GetPPB_FileChooser_Trusted_0_5_Thunk();
|
| +PPAPI_THUNK_EXPORT const PPB_Flash_Clipboard_3_0*
|
| + GetPPB_Flash_Clipboard_3_0_Thunk();
|
| +PPAPI_THUNK_EXPORT const PPB_Flash_Menu_0_2* GetPPB_Flash_Menu_0_2_Thunk();
|
| +PPAPI_THUNK_EXPORT const PPB_Flash_NetConnector_0_2*
|
| + GetPPB_Flash_NetConnector_0_2_Thunk();
|
| +PPAPI_THUNK_EXPORT const PPB_Graphics3DTrusted_1_0*
|
| + GetPPB_Graphics3DTrusted_1_0_Thunk();
|
| +PPAPI_THUNK_EXPORT const PPB_ImageDataTrusted_0_4*
|
| + GetPPB_ImageDataTrusted_0_4_Thunk();
|
| +PPAPI_THUNK_EXPORT const PPB_Instance_Private_0_1*
|
| + GetPPB_Instance_Private_0_1_Thunk();
|
| +PPAPI_THUNK_EXPORT const PPB_TCPSocket_Private_0_3*
|
| + GetPPB_TCPSocket_Private_0_3_Thunk();
|
| +PPAPI_THUNK_EXPORT const PPB_UDPSocket_Private_0_2*
|
| + GetPPB_UDPSocket_Private_0_2_Thunk();
|
| +PPAPI_THUNK_EXPORT const PPB_URLLoaderTrusted_0_3*
|
| + GetPPB_URLLoaderTrusted_0_3_Thunk();
|
|
|
| } // namespace thunk
|
| } // namespace ppapi
|
|
|