| Index: components/test_runner/event_sender.cc
|
| diff --git a/components/test_runner/event_sender.cc b/components/test_runner/event_sender.cc
|
| index 56ca837a1b29aaac6b964702951973bb2bf83c63..6e8b0e7961381e8d065187f3e642f6416c2f493b 100644
|
| --- a/components/test_runner/event_sender.cc
|
| +++ b/components/test_runner/event_sender.cc
|
| @@ -2081,7 +2081,7 @@ void EventSender::MouseScrollBy(gin::Arguments* args,
|
| // TODO(dtapuska): Gestures really should be sent by the MouseWheelEventQueue
|
| // class in the browser. But since the event doesn't propogate up into
|
| // the browser generate the events here. See crbug.com/596095.
|
| - bool send_gestures = false;
|
| + bool send_gestures = true;
|
| InitMouseWheelEvent(args, scroll_type, &wheel_event, &send_gestures);
|
| if (HandleInputEventOnViewOrPopup(wheel_event) ==
|
| WebInputEventResult::NotHandled &&
|
| @@ -2531,7 +2531,6 @@ void EventSender::InitMouseWheelEvent(gin::Arguments* args,
|
| bool paged = false;
|
| bool has_precise_scrolling_deltas = false;
|
| int modifiers = 0;
|
| - bool can_scroll = true;
|
| if (!args->PeekNext().IsEmpty()) {
|
| args->GetNext(&paged);
|
| if (!args->PeekNext().IsEmpty()) {
|
| @@ -2541,15 +2540,11 @@ void EventSender::InitMouseWheelEvent(gin::Arguments* args,
|
| args->GetNext(&value);
|
| modifiers = GetKeyModifiersFromV8(args->isolate(), value);
|
| if (!args->PeekNext().IsEmpty()) {
|
| - args->GetNext(&can_scroll);
|
| + args->GetNext(send_gestures);
|
| }
|
| }
|
| }
|
| }
|
| - if (can_scroll) {
|
| - can_scroll = false;
|
| - *send_gestures = true;
|
| - }
|
|
|
| InitMouseEvent(WebInputEvent::MouseWheel,
|
| current_pointer_state_[kMousePointerId].pressed_button_,
|
| @@ -2567,7 +2562,6 @@ void EventSender::InitMouseWheelEvent(gin::Arguments* args,
|
| event->deltaY = event->wheelTicksY;
|
| event->scrollByPage = paged;
|
| event->hasPreciseScrollingDeltas = has_precise_scrolling_deltas;
|
| - event->canScroll = can_scroll;
|
| if (scroll_type == MouseScrollType::PIXEL) {
|
| event->wheelTicksX /= kScrollbarPixelsPerTick;
|
| event->wheelTicksY /= kScrollbarPixelsPerTick;
|
|
|