Index: content/common/view_messages.h |
diff --git a/content/common/view_messages.h b/content/common/view_messages.h |
index d1e322e9efe091d535b7f2d441d15a7222c48879..aa47c3c6c85e4ce228c2e5a27a426ee0231664e3 100644 |
--- a/content/common/view_messages.h |
+++ b/content/common/view_messages.h |
@@ -49,6 +49,7 @@ |
#include "ui/gfx/rect.h" |
#include "ui/gfx/rect_f.h" |
#include "ui/gfx/vector2d.h" |
+#include "webkit/compositor_bindings/web_latency_info_impl.h" |
#include "webkit/glue/webcookie.h" |
#include "webkit/glue/webmenuitem.h" |
#include "webkit/glue/webpreferences.h" |
@@ -396,6 +397,15 @@ IPC_STRUCT_TRAITS_BEGIN(ui::SelectedFileInfo) |
IPC_STRUCT_TRAITS_MEMBER(display_name) |
IPC_STRUCT_TRAITS_END() |
+IPC_STRUCT_TRAITS_BEGIN(WebKit::WebLatencyInfoImpl) |
+ IPC_STRUCT_TRAITS_MEMBER(inputNumber) |
+ IPC_STRUCT_TRAITS_MEMBER(rendererMainFrameNumber) |
+ IPC_STRUCT_TRAITS_MEMBER(rendererImplFrameNumber) |
+ IPC_STRUCT_TRAITS_MEMBER(browserMainFrameNumber) |
+ IPC_STRUCT_TRAITS_MEMBER(browserImplFrameNumber) |
+ IPC_STRUCT_TRAITS_MEMBER(swapTimestamp) |
+IPC_STRUCT_TRAITS_END() |
+ |
IPC_STRUCT_BEGIN(ViewHostMsg_CreateWindow_Params) |
// Routing ID of the view initiating the open. |
IPC_STRUCT_MEMBER(int, opener_id) |
@@ -614,6 +624,9 @@ IPC_STRUCT_BEGIN(ViewHostMsg_UpdateRect_Params) |
// All the above coordinates are in DIP. This is the scale factor needed |
// to convert them to pixels. |
IPC_STRUCT_MEMBER(float, scale_factor) |
+ |
+ // The frame number this update rect corresponds to. |
+ IPC_STRUCT_MEMBER(WebKit::WebLatencyInfoImpl, latency_info) |
IPC_STRUCT_END() |
IPC_STRUCT_BEGIN(ViewMsg_PostMessage_Params) |
@@ -925,10 +938,15 @@ IPC_MESSAGE_ROUTED0(ViewMsg_UpdateRect_ACK) |
IPC_MESSAGE_ROUTED0(ViewMsg_SwapBuffers_ACK) |
// Sends an input event to the render widget. |
-IPC_MESSAGE_ROUTED2(ViewMsg_HandleInputEvent, |
+IPC_MESSAGE_ROUTED3(ViewMsg_HandleInputEvent, |
+ int64 /* input_number */, |
IPC::WebInputEventPointer /* event */, |
bool /* is_keyboard_shortcut */) |
+// A new frame with a new input number has started. |
+IPC_MESSAGE_ROUTED1(ViewMsg_StartFrame, |
+ int64 /* input_number */) |
+ |
// Tells the render widget that a smooth scroll completed. |
IPC_MESSAGE_ROUTED1(ViewMsg_SmoothScrollCompleted, |
int /* gesture_id */) |