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

Unified Diff: cc/debug/debug_rect_history.cc

Issue 2050033002: Revert of Remove enable/disable wheel gestures setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@can_scroll_remove
Patch Set: 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 | cc/proto/layer_tree_settings.proto » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/debug/debug_rect_history.cc
diff --git a/cc/debug/debug_rect_history.cc b/cc/debug/debug_rect_history.cc
index b936e8736c468979f7a7d8784eb61e1c905a5839..53381cfd207f4bdf16d101cf26056c11afbfe9c9 100644
--- a/cc/debug/debug_rect_history.cc
+++ b/cc/debug/debug_rect_history.cc
@@ -179,7 +179,8 @@
root_layer->layer_tree_impl()->event_listener_properties(
EventListenerClass::kMouseWheel);
if (event_properties == EventListenerProperties::kNone ||
- event_properties == EventListenerProperties::kPassive) {
+ (root_layer->layer_tree_impl()->settings().use_mouse_wheel_gestures &&
+ event_properties == EventListenerProperties::kPassive)) {
return;
}
« no previous file with comments | « no previous file | cc/proto/layer_tree_settings.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698