Index: ppapi/proxy/ppapi_messages.h |
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h |
index 95ac3d9e0d89c37bd1462bcc2447187b681efd34..915a57159cabde194060f7a5dc86bbe644b45f6b 100644 |
--- a/ppapi/proxy/ppapi_messages.h |
+++ b/ppapi/proxy/ppapi_messages.h |
@@ -9,6 +9,7 @@ |
#include "base/basictypes.h" |
#include "base/files/file_path.h" |
+#include "base/memory/linked_ptr.h" |
raymes
2014/06/02 03:51:08
Is this needed?
Peng
2014/06/02 19:01:55
Done.
|
#include "base/memory/shared_memory.h" |
#include "base/process/process.h" |
#include "base/strings/string16.h" |
@@ -35,6 +36,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 +59,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.h" |
#include "ppapi/shared_impl/dir_contents.h" |
#include "ppapi/shared_impl/file_growth.h" |
#include "ppapi/shared_impl/file_path.h" |
@@ -81,7 +84,10 @@ |
IPC_ENUM_TRAITS_MAX_VALUE(ppapi::TCPSocketVersion, |
ppapi::TCP_SOCKET_VERSION_1_1_OR_ABOVE) |
+IPC_ENUM_TRAITS_MAX_VALUE(ppapi::CompositorLayer::Type, |
+ ppapi::CompositorLayer::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) |
@@ -136,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) |
@@ -1272,6 +1288,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::CompositorLayer> /* layers */, |
+ bool /* changed */) |
+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, |