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

Unified Diff: cc/animation/scrollbar_animation_controller_linear_fade.cc

Issue 608223002: [Android]Increase Scrollbar fade delay on Resize. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 6 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
Index: cc/animation/scrollbar_animation_controller_linear_fade.cc
diff --git a/cc/animation/scrollbar_animation_controller_linear_fade.cc b/cc/animation/scrollbar_animation_controller_linear_fade.cc
index a7b220c64192e5dfc3bd84ecfa990741165e1e59..90437b3835b322c09649fe35d024d603d05bcc0b 100644
--- a/cc/animation/scrollbar_animation_controller_linear_fade.cc
+++ b/cc/animation/scrollbar_animation_controller_linear_fade.cc
@@ -15,17 +15,26 @@ ScrollbarAnimationControllerLinearFade::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 ScrollbarAnimationControllerLinearFade(
- scroll_layer, client, delay_before_starting, duration));
+ return make_scoped_ptr(
+ new ScrollbarAnimationControllerLinearFade(scroll_layer,
+ client,
+ delay_before_starting,
+ resize_delay_before_starting,
+ duration));
}
ScrollbarAnimationControllerLinearFade::ScrollbarAnimationControllerLinearFade(
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) {
}
@@ -38,8 +47,8 @@ void ScrollbarAnimationControllerLinearFade::RunAnimationFrame(float progress) {
StopAnimation();
}
-void ScrollbarAnimationControllerLinearFade::DidScrollUpdate() {
- ScrollbarAnimationController::DidScrollUpdate();
+void ScrollbarAnimationControllerLinearFade::DidScrollUpdate(bool on_resize) {
+ ScrollbarAnimationController::DidScrollUpdate(on_resize);
ApplyOpacityToScrollbars(1.f);
}

Powered by Google App Engine
This is Rietveld 408576698