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

Unified Diff: content/browser/renderer_host/input/mouse_wheel_event_queue.cc

Issue 2472943003: Revert "Touchpad scroll latching enabled for Mac behind flag." (Closed)
Patch Set: Better merge. Created 4 years, 1 month 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
Index: content/browser/renderer_host/input/mouse_wheel_event_queue.cc
diff --git a/content/browser/renderer_host/input/mouse_wheel_event_queue.cc b/content/browser/renderer_host/input/mouse_wheel_event_queue.cc
index d60f35a83f02bd72b78ff72355a3f1a510d5e503..d49a120d22e52493d595ea68fa50ba99566fae64 100644
--- a/content/browser/renderer_host/input/mouse_wheel_event_queue.cc
+++ b/content/browser/renderer_host/input/mouse_wheel_event_queue.cc
@@ -183,7 +183,7 @@ void MouseWheelEventQueue::ProcessMouseWheelAck(
if (needs_scroll_begin_) {
// If no GSB has been sent, it will be a non-synthetic GSB.
SendScrollBegin(scroll_update, false);
- } else if (has_phase_info && !enable_scroll_latching_) {
+ } else if (has_phase_info) {
// If a GSB has been sent, generate a synthetic GSB if we have phase
// information. This should be removed once crbug.com/526463 is fully
// implemented.
@@ -206,8 +206,7 @@ void MouseWheelEventQueue::ProcessMouseWheelAck(
// Generate a synthetic GSE for every update to force hit testing so
// that the non-latching behavior is preserved. Remove once
// crbug.com/526463 is fully implemented.
- if (!enable_scroll_latching_)
- SendScrollEnd(scroll_update, true);
+ SendScrollEnd(scroll_update, true);
} else {
scroll_end_timer_.Start(
FROM_HERE,
« no previous file with comments | « cc/trees/layer_tree_host_unittest_scroll.cc ('k') | content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698