Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(830)

Unified Diff: components/test_runner/event_sender.cc

Issue 2052663004: Remove canScroll from WebMouseWheelEvent as it is unused now. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Really fix android unit test Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/renderer_host/input/mouse_wheel_event_queue.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/test_runner/event_sender.cc
diff --git a/components/test_runner/event_sender.cc b/components/test_runner/event_sender.cc
index 12957907e897da41805fb96db92bc5ce20f2dd04..d6ed3d45600eb97a5a078445fa27d4ddef9d46c3 100644
--- a/components/test_runner/event_sender.cc
+++ b/components/test_runner/event_sender.cc
@@ -2114,7 +2114,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 &&
@@ -2554,7 +2554,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()) {
@@ -2564,15 +2563,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_[kRawMousePointerId].pressed_button_,
@@ -2585,7 +2580,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;
« no previous file with comments | « no previous file | content/browser/renderer_host/input/mouse_wheel_event_queue.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698