diff options
Diffstat (limited to 'chromium/cc/input/scrollbar_animation_controller.cc')
| -rw-r--r-- | chromium/cc/input/scrollbar_animation_controller.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromium/cc/input/scrollbar_animation_controller.cc b/chromium/cc/input/scrollbar_animation_controller.cc index bed51a0282d..60d7ecb8f31 100644 --- a/chromium/cc/input/scrollbar_animation_controller.cc +++ b/chromium/cc/input/scrollbar_animation_controller.cc @@ -7,6 +7,7 @@ #include <algorithm> #include "base/bind.h" +#include "base/numerics/ranges.h" #include "base/time/time.h" #include "cc/trees/layer_tree_impl.h" @@ -162,7 +163,7 @@ float ScrollbarAnimationController::AnimationProgressAtTime( base::TimeTicks now) { base::TimeDelta delta = now - last_awaken_time_; float progress = delta.InSecondsF() / fade_duration_.InSecondsF(); - return std::max(std::min(progress, 1.f), 0.f); + return base::ClampToRange(progress, 0.0f, 1.0f); } void ScrollbarAnimationController::RunAnimationFrame(float progress) { |