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

Unified Diff: cc/trees/layer_tree_settings.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 | « cc/trees/layer_tree_settings.h ('k') | components/test_runner/event_sender.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_settings.cc
diff --git a/cc/trees/layer_tree_settings.cc b/cc/trees/layer_tree_settings.cc
index af0a353866180657e5e63503b863fe98b6049c84..9ce04633b4940a0e7b13224d22b5cf8cb968fe51 100644
--- a/cc/trees/layer_tree_settings.cc
+++ b/cc/trees/layer_tree_settings.cc
@@ -116,6 +116,7 @@
verify_clip_tree_calculations == other.verify_clip_tree_calculations &&
image_decode_tasks_enabled == other.image_decode_tasks_enabled &&
wait_for_beginframe_interval == other.wait_for_beginframe_interval &&
+ use_mouse_wheel_gestures == other.use_mouse_wheel_gestures &&
max_staging_buffer_usage_in_bytes ==
other.max_staging_buffer_usage_in_bytes &&
memory_policy_ == other.memory_policy_ &&
@@ -175,6 +176,7 @@
use_occlusion_for_tile_prioritization);
proto->set_image_decode_tasks_enabled(image_decode_tasks_enabled);
proto->set_wait_for_beginframe_interval(wait_for_beginframe_interval);
+ proto->set_use_mouse_wheel_gestures(use_mouse_wheel_gestures);
proto->set_max_staging_buffer_usage_in_bytes(
max_staging_buffer_usage_in_bytes);
memory_policy_.ToProtobuf(proto->mutable_memory_policy());
@@ -238,6 +240,7 @@
proto.use_occlusion_for_tile_prioritization();
image_decode_tasks_enabled = proto.image_decode_tasks_enabled();
wait_for_beginframe_interval = proto.wait_for_beginframe_interval();
+ use_mouse_wheel_gestures = proto.use_mouse_wheel_gestures();
max_staging_buffer_usage_in_bytes = proto.max_staging_buffer_usage_in_bytes();
memory_policy_.FromProtobuf(proto.memory_policy());
initial_debug_state.FromProtobuf(proto.initial_debug_state());
« no previous file with comments | « cc/trees/layer_tree_settings.h ('k') | components/test_runner/event_sender.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698