| Index: ppapi/proxy/ppapi_messages.h
|
| diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
|
| index 10cde4e4e435f3d66d230ed191ef4354b4f5a3b5..f21ba8b115527f1780d752b7ce4391d7aa43db4c 100644
|
| --- a/ppapi/proxy/ppapi_messages.h
|
| +++ b/ppapi/proxy/ppapi_messages.h
|
| @@ -73,6 +73,11 @@
|
| #include "ppapi/shared_impl/socket_option_data.h"
|
| #include "ppapi/shared_impl/url_request_info_data.h"
|
| #include "ppapi/shared_impl/url_response_info_data.h"
|
| +#include "ui/events/latency_info.h"
|
| +
|
| +#if !defined(OS_NACL)
|
| +#include "content/common/content_param_traits_macros.h"
|
| +#endif
|
|
|
| #undef IPC_MESSAGE_EXPORT
|
| #define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT
|
| @@ -121,6 +126,14 @@ IPC_ENUM_TRAITS(PP_VideoDecodeError_Dev)
|
| IPC_ENUM_TRAITS(PP_VideoDecoder_Profile)
|
| IPC_ENUM_TRAITS_MAX_VALUE(PP_VideoFrame_Format, PP_VIDEOFRAME_FORMAT_LAST)
|
|
|
| +// For nacl build, we pull the definition directly from
|
| +// "latency_info_param_traits_macros.h" instead of through
|
| +// "content/common/content_param_traits_macros.h" so we don't have to
|
| +// rely on a nacl content build.
|
| +#if defined(OS_NACL)
|
| +#include "ui/events/latency_info_param_traits_macros.h"
|
| +#endif
|
| +
|
| IPC_STRUCT_TRAITS_BEGIN(PP_Point)
|
| IPC_STRUCT_TRAITS_MEMBER(x)
|
| IPC_STRUCT_TRAITS_MEMBER(y)
|
| @@ -300,6 +313,7 @@ IPC_STRUCT_TRAITS_BEGIN(ppapi::InputEventData)
|
| IPC_STRUCT_TRAITS_MEMBER(touches)
|
| IPC_STRUCT_TRAITS_MEMBER(changed_touches)
|
| IPC_STRUCT_TRAITS_MEMBER(target_touches)
|
| + IPC_STRUCT_TRAITS_MEMBER(latency_info)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| IPC_STRUCT_TRAITS_BEGIN(ppapi::HostPortPair)
|
| @@ -1413,7 +1427,8 @@ IPC_MESSAGE_CONTROL1(PpapiHostMsg_Graphics2D_SetScale,
|
| float /* scale */)
|
|
|
| // Graphics2D, plugin -> host -> plugin
|
| -IPC_MESSAGE_CONTROL0(PpapiHostMsg_Graphics2D_Flush)
|
| +IPC_MESSAGE_CONTROL1(PpapiHostMsg_Graphics2D_Flush,
|
| + std::vector<ui::LatencyInfo> /* latency_info */)
|
| IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Graphics2D_FlushAck)
|
|
|
| IPC_MESSAGE_CONTROL2(PpapiHostMsg_Graphics2D_ReadImageData,
|
|
|