| Index: content/common/input/web_input_event_traits.cc
|
| diff --git a/content/common/input/web_input_event_traits.cc b/content/common/input/web_input_event_traits.cc
|
| index b2346401ad4d088e8477fd77350a1579eabd43e8..d155b61e412da08771f30748701820459e10e9ed 100644
|
| --- a/content/common/input/web_input_event_traits.cc
|
| +++ b/content/common/input/web_input_event_traits.cc
|
| @@ -9,6 +9,7 @@
|
|
|
| #include "base/logging.h"
|
| #include "base/strings/stringprintf.h"
|
| +#include "content/common/input_messages.h"
|
|
|
| using base::StringAppendF;
|
| using base::SStringPrintf;
|
| @@ -463,7 +464,8 @@ void WebInputEventTraits::Coalesce(const WebInputEvent& event_to_coalesce,
|
| Apply(WebInputEventCoalesce(), event->type, event_to_coalesce, event);
|
| }
|
|
|
| -bool WebInputEventTraits::IgnoresAckDisposition(const WebInputEvent& event) {
|
| +bool WebInputEventTraits::WillReceiveAckFromRenderer(
|
| + const WebInputEvent& event) {
|
| switch (event.type) {
|
| case WebInputEvent::MouseDown:
|
| case WebInputEvent::MouseUp:
|
| @@ -479,14 +481,20 @@ bool WebInputEventTraits::IgnoresAckDisposition(const WebInputEvent& event) {
|
| case WebInputEvent::GesturePinchBegin:
|
| case WebInputEvent::GesturePinchEnd:
|
| case WebInputEvent::TouchCancel:
|
| - return true;
|
| + return false;
|
| case WebInputEvent::TouchStart:
|
| - case WebInputEvent::TouchMove:
|
| case WebInputEvent::TouchEnd:
|
| - return !static_cast<const WebTouchEvent&>(event).cancelable;
|
| + return static_cast<const WebTouchEvent&>(event).cancelable;
|
| default:
|
| - return false;
|
| + return true;
|
| + }
|
| +}
|
| +
|
| +uint32 WebInputEventTraits::GetUniqueTouchEventId(const WebInputEvent& event) {
|
| + if (WebInputEvent::isTouchEventType(event.type)) {
|
| + return static_cast<const WebTouchEvent&>(event).uniqueTouchEventId;
|
| }
|
| + return 0U;
|
| }
|
|
|
| } // namespace content
|
|
|