Index: ppapi/proxy/ppapi_messages.h |
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h |
index 95ac3d9e0d89c37bd1462bcc2447187b681efd34..e7b8ca1a0547256c0814f0c7e981ea0bc6893c09 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 |
piman
2014/05/12 22:10:36
ppapi can't depend on content.
Yufeng Shen (Slow to review)
2014/05/13 00:16:15
I am not sure how to do this correctly.
so curren
|
#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) |
@@ -884,6 +898,8 @@ IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_RequestInputEvents, |
IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBInstance_ClearInputEvents, |
PP_Instance /* instance */, |
uint32_t /* event_classes */) |
+IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBInstance_StartTrackingLatency, |
+ PP_Instance /* instance */) |
IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBInstance_PostMessage, |
PP_Instance /* instance */, |
ppapi::proxy::SerializedVar /* message */) |
@@ -1418,7 +1434,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, |