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

Unified Diff: cc/animation/scrollbar_animation_controller_thinning.cc

Issue 608223002: [Android]Increase Scrollbar fade delay on Resize. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed review comments Created 6 years, 3 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
Index: cc/animation/scrollbar_animation_controller_thinning.cc
diff --git a/cc/animation/scrollbar_animation_controller_thinning.cc b/cc/animation/scrollbar_animation_controller_thinning.cc
index 892e3079e46a8e755c6af76741e571fbe801a4f3..0c05709c8c06e7985104aebb3cf9a36d4bf20af1 100644
--- a/cc/animation/scrollbar_animation_controller_thinning.cc
+++ b/cc/animation/scrollbar_animation_controller_thinning.cc
@@ -21,17 +21,26 @@ ScrollbarAnimationControllerThinning::Create(
LayerImpl* scroll_layer,
ScrollbarAnimationControllerClient* client,
base::TimeDelta delay_before_starting,
+ base::TimeDelta resize_delay_before_starting,
base::TimeDelta duration) {
- return make_scoped_ptr(new ScrollbarAnimationControllerThinning(
- scroll_layer, client, delay_before_starting, duration));
+ return make_scoped_ptr(
+ new ScrollbarAnimationControllerThinning(scroll_layer,
+ client,
+ delay_before_starting,
+ resize_delay_before_starting,
+ duration));
}
ScrollbarAnimationControllerThinning::ScrollbarAnimationControllerThinning(
LayerImpl* scroll_layer,
ScrollbarAnimationControllerClient* client,
base::TimeDelta delay_before_starting,
+ base::TimeDelta resize_delay_before_starting,
base::TimeDelta duration)
- : ScrollbarAnimationController(client, delay_before_starting, duration),
+ : ScrollbarAnimationController(client,
+ delay_before_starting,
+ resize_delay_before_starting,
+ duration),
scroll_layer_(scroll_layer),
mouse_is_over_scrollbar_(false),
mouse_is_near_scrollbar_(false),
@@ -65,8 +74,8 @@ void ScrollbarAnimationControllerThinning::DidMouseMoveOffScrollbar() {
StartAnimation();
}
-void ScrollbarAnimationControllerThinning::DidScrollUpdate() {
- ScrollbarAnimationController::DidScrollUpdate();
+void ScrollbarAnimationControllerThinning::DidScrollUpdate(bool on_resize) {
+ ScrollbarAnimationController::DidScrollUpdate(on_resize);
ApplyOpacityAndThumbThicknessScale(
1, mouse_is_near_scrollbar_ ? 1.f : kIdleThicknessScale);

Powered by Google App Engine
This is Rietveld 408576698