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

Side by Side Diff: cc/trees/layer_tree_settings.cc

Issue 2047093002: Remove enable/disable wheel gestures setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@can_scroll_remove
Patch Set: Remove unused, uninitialized variable on mac causing occasional failure 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/trees/layer_tree_settings.h" 5 #include "cc/trees/layer_tree_settings.h"
6 6
7 #include "cc/proto/gfx_conversions.h" 7 #include "cc/proto/gfx_conversions.h"
8 #include "cc/proto/layer_tree_settings.pb.h" 8 #include "cc/proto/layer_tree_settings.pb.h"
9 #include "third_party/khronos/GLES2/gl2.h" 9 #include "third_party/khronos/GLES2/gl2.h"
10 10
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 use_partial_raster == other.use_partial_raster && 109 use_partial_raster == other.use_partial_raster &&
110 enable_elastic_overscroll == other.enable_elastic_overscroll && 110 enable_elastic_overscroll == other.enable_elastic_overscroll &&
111 use_image_texture_targets == other.use_image_texture_targets && 111 use_image_texture_targets == other.use_image_texture_targets &&
112 ignore_root_layer_flings == other.ignore_root_layer_flings && 112 ignore_root_layer_flings == other.ignore_root_layer_flings &&
113 scheduled_raster_task_limit == other.scheduled_raster_task_limit && 113 scheduled_raster_task_limit == other.scheduled_raster_task_limit &&
114 use_occlusion_for_tile_prioritization == 114 use_occlusion_for_tile_prioritization ==
115 other.use_occlusion_for_tile_prioritization && 115 other.use_occlusion_for_tile_prioritization &&
116 verify_clip_tree_calculations == other.verify_clip_tree_calculations && 116 verify_clip_tree_calculations == other.verify_clip_tree_calculations &&
117 image_decode_tasks_enabled == other.image_decode_tasks_enabled && 117 image_decode_tasks_enabled == other.image_decode_tasks_enabled &&
118 wait_for_beginframe_interval == other.wait_for_beginframe_interval && 118 wait_for_beginframe_interval == other.wait_for_beginframe_interval &&
119 use_mouse_wheel_gestures == other.use_mouse_wheel_gestures &&
120 max_staging_buffer_usage_in_bytes == 119 max_staging_buffer_usage_in_bytes ==
121 other.max_staging_buffer_usage_in_bytes && 120 other.max_staging_buffer_usage_in_bytes &&
122 memory_policy_ == other.memory_policy_ && 121 memory_policy_ == other.memory_policy_ &&
123 LayerTreeDebugState::Equal(initial_debug_state, 122 LayerTreeDebugState::Equal(initial_debug_state,
124 other.initial_debug_state) && 123 other.initial_debug_state) &&
125 use_cached_picture_raster == other.use_cached_picture_raster; 124 use_cached_picture_raster == other.use_cached_picture_raster;
126 } 125 }
127 126
128 void LayerTreeSettings::ToProtobuf(proto::LayerTreeSettings* proto) const { 127 void LayerTreeSettings::ToProtobuf(proto::LayerTreeSettings* proto) const {
129 renderer_settings.ToProtobuf(proto->mutable_renderer_settings()); 128 renderer_settings.ToProtobuf(proto->mutable_renderer_settings());
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 max_memory_for_prepaint_percentage); 168 max_memory_for_prepaint_percentage);
170 proto->set_use_zero_copy(use_zero_copy); 169 proto->set_use_zero_copy(use_zero_copy);
171 proto->set_use_partial_raster(use_partial_raster); 170 proto->set_use_partial_raster(use_partial_raster);
172 proto->set_enable_elastic_overscroll(enable_elastic_overscroll); 171 proto->set_enable_elastic_overscroll(enable_elastic_overscroll);
173 proto->set_ignore_root_layer_flings(ignore_root_layer_flings); 172 proto->set_ignore_root_layer_flings(ignore_root_layer_flings);
174 proto->set_scheduled_raster_task_limit(scheduled_raster_task_limit); 173 proto->set_scheduled_raster_task_limit(scheduled_raster_task_limit);
175 proto->set_use_occlusion_for_tile_prioritization( 174 proto->set_use_occlusion_for_tile_prioritization(
176 use_occlusion_for_tile_prioritization); 175 use_occlusion_for_tile_prioritization);
177 proto->set_image_decode_tasks_enabled(image_decode_tasks_enabled); 176 proto->set_image_decode_tasks_enabled(image_decode_tasks_enabled);
178 proto->set_wait_for_beginframe_interval(wait_for_beginframe_interval); 177 proto->set_wait_for_beginframe_interval(wait_for_beginframe_interval);
179 proto->set_use_mouse_wheel_gestures(use_mouse_wheel_gestures);
180 proto->set_max_staging_buffer_usage_in_bytes( 178 proto->set_max_staging_buffer_usage_in_bytes(
181 max_staging_buffer_usage_in_bytes); 179 max_staging_buffer_usage_in_bytes);
182 memory_policy_.ToProtobuf(proto->mutable_memory_policy()); 180 memory_policy_.ToProtobuf(proto->mutable_memory_policy());
183 initial_debug_state.ToProtobuf(proto->mutable_initial_debug_state()); 181 initial_debug_state.ToProtobuf(proto->mutable_initial_debug_state());
184 proto->set_use_cached_picture_raster(use_cached_picture_raster); 182 proto->set_use_cached_picture_raster(use_cached_picture_raster);
185 183
186 for (unsigned u : use_image_texture_targets) 184 for (unsigned u : use_image_texture_targets)
187 proto->add_use_image_texture_targets(u); 185 proto->add_use_image_texture_targets(u);
188 } 186 }
189 187
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 use_partial_raster = proto.use_partial_raster(); 231 use_partial_raster = proto.use_partial_raster();
234 enable_elastic_overscroll = proto.enable_elastic_overscroll(); 232 enable_elastic_overscroll = proto.enable_elastic_overscroll();
235 // |use_image_texture_targets| contains default values, so clear first. 233 // |use_image_texture_targets| contains default values, so clear first.
236 use_image_texture_targets.clear(); 234 use_image_texture_targets.clear();
237 ignore_root_layer_flings = proto.ignore_root_layer_flings(); 235 ignore_root_layer_flings = proto.ignore_root_layer_flings();
238 scheduled_raster_task_limit = proto.scheduled_raster_task_limit(); 236 scheduled_raster_task_limit = proto.scheduled_raster_task_limit();
239 use_occlusion_for_tile_prioritization = 237 use_occlusion_for_tile_prioritization =
240 proto.use_occlusion_for_tile_prioritization(); 238 proto.use_occlusion_for_tile_prioritization();
241 image_decode_tasks_enabled = proto.image_decode_tasks_enabled(); 239 image_decode_tasks_enabled = proto.image_decode_tasks_enabled();
242 wait_for_beginframe_interval = proto.wait_for_beginframe_interval(); 240 wait_for_beginframe_interval = proto.wait_for_beginframe_interval();
243 use_mouse_wheel_gestures = proto.use_mouse_wheel_gestures();
244 max_staging_buffer_usage_in_bytes = proto.max_staging_buffer_usage_in_bytes(); 241 max_staging_buffer_usage_in_bytes = proto.max_staging_buffer_usage_in_bytes();
245 memory_policy_.FromProtobuf(proto.memory_policy()); 242 memory_policy_.FromProtobuf(proto.memory_policy());
246 initial_debug_state.FromProtobuf(proto.initial_debug_state()); 243 initial_debug_state.FromProtobuf(proto.initial_debug_state());
247 use_cached_picture_raster = proto.use_cached_picture_raster(); 244 use_cached_picture_raster = proto.use_cached_picture_raster();
248 245
249 for (int i = 0; i < proto.use_image_texture_targets_size(); ++i) 246 for (int i = 0; i < proto.use_image_texture_targets_size(); ++i)
250 use_image_texture_targets.push_back(proto.use_image_texture_targets(i)); 247 use_image_texture_targets.push_back(proto.use_image_texture_targets(i));
251 } 248 }
252 249
253 SchedulerSettings LayerTreeSettings::ToSchedulerSettings() const { 250 SchedulerSettings LayerTreeSettings::ToSchedulerSettings() const {
254 SchedulerSettings scheduler_settings; 251 SchedulerSettings scheduler_settings;
255 scheduler_settings.use_external_begin_frame_source = 252 scheduler_settings.use_external_begin_frame_source =
256 use_external_begin_frame_source; 253 use_external_begin_frame_source;
257 scheduler_settings.main_frame_before_activation_enabled = 254 scheduler_settings.main_frame_before_activation_enabled =
258 main_frame_before_activation_enabled; 255 main_frame_before_activation_enabled;
259 scheduler_settings.timeout_and_draw_when_animation_checkerboards = 256 scheduler_settings.timeout_and_draw_when_animation_checkerboards =
260 timeout_and_draw_when_animation_checkerboards; 257 timeout_and_draw_when_animation_checkerboards;
261 scheduler_settings.using_synchronous_renderer_compositor = 258 scheduler_settings.using_synchronous_renderer_compositor =
262 using_synchronous_renderer_compositor; 259 using_synchronous_renderer_compositor;
263 scheduler_settings.throttle_frame_production = wait_for_beginframe_interval; 260 scheduler_settings.throttle_frame_production = wait_for_beginframe_interval;
264 scheduler_settings.background_frame_interval = 261 scheduler_settings.background_frame_interval =
265 base::TimeDelta::FromSecondsD(1.0 / background_animation_rate); 262 base::TimeDelta::FromSecondsD(1.0 / background_animation_rate);
266 scheduler_settings.abort_commit_before_output_surface_creation = 263 scheduler_settings.abort_commit_before_output_surface_creation =
267 abort_commit_before_output_surface_creation; 264 abort_commit_before_output_surface_creation;
268 return scheduler_settings; 265 return scheduler_settings;
269 } 266 }
270 267
271 } // namespace cc 268 } // namespace cc
OLDNEW
« 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