| Index: content/common/view_messages.h
|
| diff --git a/content/common/view_messages.h b/content/common/view_messages.h
|
| index a5708608c49474793151d48666b87b3d1e7220b7..d9912cde791490a9163a5b0b43b0b5574994e015 100644
|
| --- a/content/common/view_messages.h
|
| +++ b/content/common/view_messages.h
|
| @@ -14,6 +14,7 @@
|
| #include "content/common/content_export.h"
|
| #include "content/common/content_param_traits.h"
|
| #include "content/common/cookie_data.h"
|
| +#include "content/common/input/did_overscroll_params.h"
|
| #include "content/common/navigation_gesture.h"
|
| #include "content/common/pepper_renderer_instance_data.h"
|
| #include "content/common/view_message_enums.h"
|
| @@ -153,6 +154,12 @@ IPC_STRUCT_TRAITS_BEGIN(content::DateTimeSuggestion)
|
| IPC_STRUCT_TRAITS_MEMBER(label)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| +IPC_STRUCT_TRAITS_BEGIN(content::DidOverscrollParams)
|
| + IPC_STRUCT_TRAITS_MEMBER(accumulated_overscroll)
|
| + IPC_STRUCT_TRAITS_MEMBER(latest_overscroll_delta)
|
| + IPC_STRUCT_TRAITS_MEMBER(current_fling_velocity)
|
| +IPC_STRUCT_TRAITS_END()
|
| +
|
| IPC_STRUCT_TRAITS_BEGIN(content::FaviconURL)
|
| IPC_STRUCT_TRAITS_MEMBER(icon_url)
|
| IPC_STRUCT_TRAITS_MEMBER(icon_type)
|
| @@ -1564,9 +1571,8 @@ IPC_MESSAGE_ROUTED2(ViewHostMsg_SwapCompositorFrame,
|
|
|
| // Sent by the compositor when input scroll events are dropped due to bounds
|
| // restricions on the root scroll offset.
|
| -IPC_MESSAGE_ROUTED2(ViewHostMsg_DidOverscroll,
|
| - gfx::Vector2dF /* accumulated_overscroll */,
|
| - gfx::Vector2dF /* current_fling_velocity */)
|
| +IPC_MESSAGE_ROUTED1(ViewHostMsg_DidOverscroll,
|
| + content::DidOverscrollParams /* params */)
|
|
|
| // Sent by the compositor when a flinging animation is stopped.
|
| IPC_MESSAGE_ROUTED0(ViewHostMsg_DidStopFlinging)
|
|
|