Index: ppapi/proxy/ppapi_messages.h |
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h |
index c36ceac59be8c391cd63ee3978877df76a0f9766..2480a87ceca32bcfff95df1348f93684ad2183f2 100644 |
--- a/ppapi/proxy/ppapi_messages.h |
+++ b/ppapi/proxy/ppapi_messages.h |
@@ -15,6 +15,7 @@ |
#include "base/sync_socket.h" |
#include "gpu/command_buffer/common/command_buffer.h" |
#include "gpu/command_buffer/common/mailbox.h" |
+#include "gpu/command_buffer/common/sync_token.h" |
#include "gpu/ipc/gpu_command_buffer_traits.h" |
#include "ipc/ipc_channel_handle.h" |
#include "ipc/ipc_message_macros.h" |
@@ -280,6 +281,7 @@ IPC_STRUCT_TRAITS_BEGIN(ppapi::CompositorLayerData::TextureLayer) |
IPC_STRUCT_TRAITS_MEMBER(mailbox) |
IPC_STRUCT_TRAITS_MEMBER(target) |
IPC_STRUCT_TRAITS_MEMBER(sync_point) |
+ IPC_STRUCT_TRAITS_MEMBER(sync_token) |
dcheng
2015/10/27 19:09:28
It appears that the ParamTraits for gpu::SyncToken
David Yen
2015/10/28 22:03:43
Yes, should the owners be changed?
|
IPC_STRUCT_TRAITS_MEMBER(source_rect) |
IPC_STRUCT_TRAITS_MEMBER(premult_alpha) |
IPC_STRUCT_TRAITS_END() |
@@ -1400,9 +1402,10 @@ 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, |
+IPC_MESSAGE_CONTROL4(PpapiPluginMsg_Compositor_ReleaseResource, |
int32_t /* id */, |
uint32_t /* sync_point */, |
+ gpu::SyncToken /* sync_token */, |
bool /* is_lost */) |
// File chooser. |