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

Unified Diff: cc/trees/layer_tree_impl.cc

Issue 2442573002: Implement fade-out animation for Aura overlay scrollbars (CC only). (Closed)
Patch Set: Address aelias@'s feedback Created 4 years, 2 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/input/scrollbar_animation_controller_thinning_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_impl.cc
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index 89035df5acb5fefdcaf9ac8ef63e2b78e05c1aca..694605a7b7519bed312c5e83808431e2530406a5 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -1362,17 +1362,19 @@ LayerTreeImpl::CreateScrollbarAnimationController(int scroll_layer_id) {
DCHECK(!settings().scrollbar_fade_duration.is_zero());
base::TimeDelta delay = settings().scrollbar_fade_delay;
base::TimeDelta resize_delay = settings().scrollbar_fade_resize_delay;
- base::TimeDelta duration = settings().scrollbar_fade_duration;
+ base::TimeDelta fade_duration = settings().scrollbar_fade_duration;
switch (settings().scrollbar_animator) {
case LayerTreeSettings::LINEAR_FADE: {
return ScrollbarAnimationControllerLinearFade::Create(
scroll_layer_id, layer_tree_host_impl_, delay, resize_delay,
- duration);
+ fade_duration);
}
case LayerTreeSettings::THINNING: {
+ base::TimeDelta thinning_duration =
+ settings().scrollbar_thinning_duration;
return ScrollbarAnimationControllerThinning::Create(
scroll_layer_id, layer_tree_host_impl_, delay, resize_delay,
- duration);
+ fade_duration, thinning_duration);
}
case LayerTreeSettings::NO_ANIMATOR:
NOTREACHED();
« no previous file with comments | « cc/input/scrollbar_animation_controller_thinning_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698