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

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

Issue 2692243005: Merge Compositor's ScrollbarAnimationControllers into single class (Closed)
Patch Set: fix confict constant Created 3 years, 10 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
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 #ifndef CC_TREES_LAYER_TREE_SETTINGS_H_ 5 #ifndef CC_TREES_LAYER_TREE_SETTINGS_H_
6 #define CC_TREES_LAYER_TREE_SETTINGS_H_ 6 #define CC_TREES_LAYER_TREE_SETTINGS_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <vector> 10 #include <vector>
(...skipping 27 matching lines...) Expand all
38 bool can_use_lcd_text = true; 38 bool can_use_lcd_text = true;
39 bool use_distance_field_text = false; 39 bool use_distance_field_text = false;
40 bool gpu_rasterization_forced = false; 40 bool gpu_rasterization_forced = false;
41 bool async_worker_context_enabled = false; 41 bool async_worker_context_enabled = false;
42 int gpu_rasterization_msaa_sample_count = 0; 42 int gpu_rasterization_msaa_sample_count = 0;
43 float gpu_rasterization_skewport_target_time_in_seconds = 0.2f; 43 float gpu_rasterization_skewport_target_time_in_seconds = 0.2f;
44 bool create_low_res_tiling = false; 44 bool create_low_res_tiling = false;
45 45
46 enum ScrollbarAnimator { 46 enum ScrollbarAnimator {
47 NO_ANIMATOR, 47 NO_ANIMATOR,
48 LINEAR_FADE, 48 ANDROID_OVERLAY,
49 THINNING, 49 AURA_OVERLAY,
50 }; 50 };
51 ScrollbarAnimator scrollbar_animator = NO_ANIMATOR; 51 ScrollbarAnimator scrollbar_animator = NO_ANIMATOR;
52 base::TimeDelta scrollbar_fade_delay; 52 base::TimeDelta scrollbar_fade_delay;
53 base::TimeDelta scrollbar_fade_resize_delay; 53 base::TimeDelta scrollbar_fade_resize_delay;
54 base::TimeDelta scrollbar_fade_duration; 54 base::TimeDelta scrollbar_fade_duration;
55 base::TimeDelta scrollbar_thinning_duration; 55 base::TimeDelta scrollbar_thinning_duration;
56 SkColor solid_color_scrollbar_color = SK_ColorWHITE; 56 SkColor solid_color_scrollbar_color = SK_ColorWHITE;
57 bool timeout_and_draw_when_animation_checkerboards = true; 57 bool timeout_and_draw_when_animation_checkerboards = true;
58 bool layer_transforms_should_scale_layer_contents = false; 58 bool layer_transforms_should_scale_layer_contents = false;
59 bool layers_always_allowed_lcd_text = false; 59 bool layers_always_allowed_lcd_text = false;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 // If set to true, this causes TileManager to verify that all required and NOW 94 // If set to true, this causes TileManager to verify that all required and NOW
95 // tiles come before lower priority tiles. 95 // tiles come before lower priority tiles.
96 bool check_tile_priority_inversion = false; 96 bool check_tile_priority_inversion = false;
97 97
98 LayerTreeDebugState initial_debug_state; 98 LayerTreeDebugState initial_debug_state;
99 }; 99 };
100 100
101 } // namespace cc 101 } // namespace cc
102 102
103 #endif // CC_TREES_LAYER_TREE_SETTINGS_H_ 103 #endif // CC_TREES_LAYER_TREE_SETTINGS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698