| 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 fa9f433a1d7fd538a6e1cd23ce6e0424e98f6cd9..b6e22dc4acfc0a1924e28a07d7d2482cd32bfd38 100644
|
| --- a/content/common/input/web_input_event_traits.cc
|
| +++ b/content/common/input/web_input_event_traits.cc
|
| @@ -147,6 +147,7 @@ void Coalesce(const WebTouchEvent& event_to_coalesce, WebTouchEvent* event) {
|
|
|
| bool CanCoalesce(const WebGestureEvent& event_to_coalesce,
|
| const WebGestureEvent& event) {
|
| + CHECK_NE(WebInputEvent::GestureScrollUpdateWithoutPropagation, event.type);
|
| if (event.type != event_to_coalesce.type ||
|
| event.sourceDevice != event_to_coalesce.sourceDevice ||
|
| event.modifiers != event_to_coalesce.modifiers)
|
| @@ -277,6 +278,7 @@ const char* WebInputEventTraits::GetName(WebInputEvent::Type type) {
|
| CASE_TYPE(GestureScrollBegin);
|
| CASE_TYPE(GestureScrollEnd);
|
| CASE_TYPE(GestureScrollUpdate);
|
| + CASE_TYPE(GestureScrollUpdateWithoutPropagation);
|
| CASE_TYPE(GestureFlingStart);
|
| CASE_TYPE(GestureFlingCancel);
|
| CASE_TYPE(GestureShowPress);
|
|
|