Index: ppapi/proxy/ppapi_messages.h |
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h |
index 41b40ce53724c20d96ed4724675b56171b26a39d..a1ef6d6de597ca5eb7b90f2bd6efd8b8caaa6f77 100644 |
--- a/ppapi/proxy/ppapi_messages.h |
+++ b/ppapi/proxy/ppapi_messages.h |
@@ -37,6 +37,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" |
@@ -59,6 +60,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" |
@@ -86,6 +88,7 @@ |
IPC_ENUM_TRAITS_MAX_VALUE(ppapi::TCPSocketVersion, |
ppapi::TCP_SOCKET_VERSION_1_1_OR_ABOVE) |
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(PP_SessionType) |
@@ -143,11 +146,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) |
@@ -222,6 +235,41 @@ IPC_STRUCT_TRAITS_BEGIN(ppapi::FileGrowth) |
IPC_STRUCT_TRAITS_MEMBER(append_mode_write_amount) |
IPC_STRUCT_TRAITS_END() |
+IPC_STRUCT_TRAITS_BEGIN(ppapi::CompositorLayerData) |
+ IPC_STRUCT_TRAITS_MEMBER(common) |
+ IPC_STRUCT_TRAITS_MEMBER(color) |
+ IPC_STRUCT_TRAITS_MEMBER(texture) |
+ IPC_STRUCT_TRAITS_MEMBER(image) |
+IPC_STRUCT_TRAITS_END() |
+ |
+IPC_STRUCT_TRAITS_BEGIN(ppapi::CompositorLayerData::LayerCommon) |
+ IPC_STRUCT_TRAITS_MEMBER(size) |
+ IPC_STRUCT_TRAITS_MEMBER(clip_rect) |
+ IPC_STRUCT_TRAITS_MEMBER(transform) |
+ IPC_STRUCT_TRAITS_MEMBER(blend_mode) |
+ IPC_STRUCT_TRAITS_MEMBER(opacity) |
+ IPC_STRUCT_TRAITS_MEMBER(resource_id) |
+IPC_STRUCT_TRAITS_END() |
+ |
+IPC_STRUCT_TRAITS_BEGIN(ppapi::CompositorLayerData::ColorLayer) |
+ IPC_STRUCT_TRAITS_MEMBER(red) |
+ IPC_STRUCT_TRAITS_MEMBER(green) |
+ IPC_STRUCT_TRAITS_MEMBER(blue) |
+ IPC_STRUCT_TRAITS_MEMBER(alpha) |
+IPC_STRUCT_TRAITS_END() |
+ |
+IPC_STRUCT_TRAITS_BEGIN(ppapi::CompositorLayerData::ImageLayer) |
+ IPC_STRUCT_TRAITS_MEMBER(resource) |
+ IPC_STRUCT_TRAITS_MEMBER(source_rect) |
+IPC_STRUCT_TRAITS_END() |
+ |
+IPC_STRUCT_TRAITS_BEGIN(ppapi::CompositorLayerData::TextureLayer) |
+ IPC_STRUCT_TRAITS_MEMBER(mailbox) |
+ IPC_STRUCT_TRAITS_MEMBER(sync_point) |
+ IPC_STRUCT_TRAITS_MEMBER(source_rect) |
+ IPC_STRUCT_TRAITS_MEMBER(premult_alpha) |
+IPC_STRUCT_TRAITS_END() |
+ |
IPC_STRUCT_TRAITS_BEGIN(ppapi::DeviceRefData) |
IPC_STRUCT_TRAITS_MEMBER(type) |
IPC_STRUCT_TRAITS_MEMBER(name) |
@@ -1299,6 +1347,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, |