| Index: ppapi/proxy/ppapi_messages.h
|
| diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
|
| index 6cd36dfdd7c02ccf0add86008a17f4a1da8d8625..ab43ad77f74ce99861a3c8f162e6adc0a38ba8c2 100644
|
| --- a/ppapi/proxy/ppapi_messages.h
|
| +++ b/ppapi/proxy/ppapi_messages.h
|
| @@ -35,6 +35,7 @@
|
| #include "ppapi/c/pp_size.h"
|
| #include "ppapi/c/pp_time.h"
|
| #include "ppapi/c/ppb_audio_config.h"
|
| +#include "ppapi/c/ppb_compositor_layer.h"
|
| #include "ppapi/c/ppb_image_data.h"
|
| #include "ppapi/c/ppb_tcp_socket.h"
|
| #include "ppapi/c/ppb_text_input_controller.h"
|
| @@ -57,6 +58,7 @@
|
| #include "ppapi/proxy/serialized_handle.h"
|
| #include "ppapi/proxy/serialized_structs.h"
|
| #include "ppapi/proxy/serialized_var.h"
|
| +#include "ppapi/shared_impl/compositor_layer_data.h"
|
| #include "ppapi/shared_impl/dir_contents.h"
|
| #include "ppapi/shared_impl/file_growth.h"
|
| #include "ppapi/shared_impl/file_path.h"
|
| @@ -82,7 +84,10 @@
|
|
|
| IPC_ENUM_TRAITS_MAX_VALUE(ppapi::TCPSocketVersion,
|
| ppapi::TCP_SOCKET_VERSION_1_1_OR_ABOVE)
|
| +IPC_ENUM_TRAITS_MAX_VALUE(ppapi::CompositorLayerData::Type,
|
| + ppapi::CompositorLayerData::TYPE_LAST)
|
| IPC_ENUM_TRAITS(PP_AudioSampleRate)
|
| +IPC_ENUM_TRAITS_MAX_VALUE(PP_BlendMode, PP_BLENDMODE_LAST)
|
| IPC_ENUM_TRAITS(PP_DeviceType_Dev)
|
| IPC_ENUM_TRAITS(PP_DecryptorStreamType)
|
| IPC_ENUM_TRAITS_MAX_VALUE(PP_FileSystemType, PP_FILESYSTEMTYPE_ISOLATED)
|
| @@ -137,11 +142,21 @@ IPC_STRUCT_TRAITS_BEGIN(PP_Size)
|
| IPC_STRUCT_TRAITS_MEMBER(width)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| +IPC_STRUCT_TRAITS_BEGIN(PP_FloatSize)
|
| + IPC_STRUCT_TRAITS_MEMBER(height)
|
| + IPC_STRUCT_TRAITS_MEMBER(width)
|
| +IPC_STRUCT_TRAITS_END()
|
| +
|
| IPC_STRUCT_TRAITS_BEGIN(PP_Rect)
|
| IPC_STRUCT_TRAITS_MEMBER(point)
|
| IPC_STRUCT_TRAITS_MEMBER(size)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| +IPC_STRUCT_TRAITS_BEGIN(PP_FloatRect)
|
| + IPC_STRUCT_TRAITS_MEMBER(point)
|
| + IPC_STRUCT_TRAITS_MEMBER(size)
|
| +IPC_STRUCT_TRAITS_END()
|
| +
|
| IPC_STRUCT_TRAITS_BEGIN(PP_ImageDataDesc)
|
| IPC_STRUCT_TRAITS_MEMBER(format)
|
| IPC_STRUCT_TRAITS_MEMBER(size)
|
| @@ -1276,6 +1291,17 @@ IPC_MESSAGE_CONTROL3(PpapiHostMsg_UMA_HistogramEnumeration,
|
| IPC_MESSAGE_CONTROL0(PpapiHostMsg_UMA_IsCrashReportingEnabled);
|
| IPC_MESSAGE_CONTROL0(PpapiPluginMsg_UMA_IsCrashReportingEnabledReply);
|
|
|
| +// Compositor
|
| +IPC_MESSAGE_CONTROL0(PpapiHostMsg_Compositor_Create)
|
| +IPC_MESSAGE_CONTROL2(PpapiHostMsg_Compositor_CommitLayers,
|
| + std::vector<ppapi::CompositorLayerData> /* layers */,
|
| + bool /* reset */)
|
| +IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Compositor_CommitLayersReply)
|
| +IPC_MESSAGE_CONTROL3(PpapiPluginMsg_Compositor_ReleaseResource,
|
| + int32_t /* id */,
|
| + uint32_t /* sync_point */,
|
| + bool /* is_lost */)
|
| +
|
| // File chooser.
|
| IPC_MESSAGE_CONTROL0(PpapiHostMsg_FileChooser_Create)
|
| IPC_MESSAGE_CONTROL4(PpapiHostMsg_FileChooser_Show,
|
|
|