Use clampTo instead of chaining std::max(std::min(...))

third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm

 /*
  * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 22 matching lines @@
 #include "platform/animation/TimingFunction.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/mac/BlockExceptions.h"
 #include "platform/mac/NSScrollerImpDetails.h"
 #include "platform/scroll/ScrollableArea.h"
 #include "platform/scroll/ScrollbarTheme.h"
 #include "platform/scroll/ScrollbarThemeMacCommon.h"
 #include "platform/scroll/ScrollbarThemeMacOverlayAPI.h"
 #include "wtf/MainThread.h"
+#include "wtf/MathExtras.h"
 #include "wtf/PassOwnPtr.h"
 
 using namespace blink;
 
 static bool supportsUIStateTransitionProgress()
 {
     // FIXME: This is temporary until all platforms that support ScrollbarPainter support this part of the API.
     static bool globalSupportsUIStateTransitionProgress = [NSClassFromString(@"NSScrollerImp") instancesRespondToSelector:@selector(mouseEnteredScroller)];
     return globalSupportsUIStateTransitionProgress;
 }
@@ skipping 283 matching lines @@
 private:
     void timerFired(Timer<WebScrollbarPartAnimationTimer>*)
     {
         double currentTime = WTF::currentTime();
         double delta = currentTime - m_startTime;
 
         if (delta >= m_duration)
             m_timer.stop();
 
         double fraction = delta / m_duration;
-        fraction = std::min(1.0, fraction);
-        fraction = std::max(0.0, fraction);
+        fraction = clampTo(fraction, 0.0, 1.0);
         double progress = m_timingFunction->evaluate(fraction, 0.001);
         [m_animation setCurrentProgress:progress];
     }
 
     Timer<WebScrollbarPartAnimationTimer> m_timer;
     double m_startTime;  // In seconds.
     double m_duration;   // In seconds.
     WebScrollbarPartAnimation* m_animation;  // Weak, owns this.
     RefPtr<CubicBezierTimingFunction> m_timingFunction;
 };
@@ skipping 405 matching lines @@
 {
     [m_scrollAnimationHelper.get() _stopRun];
     immediateScrollTo(offset);
 }
 
 FloatPoint ScrollAnimatorMac::adjustScrollPositionIfNecessary(const FloatPoint& position) const
 {
     IntPoint minPos = m_scrollableArea->minimumScrollPosition();
     IntPoint maxPos = m_scrollableArea->maximumScrollPosition();
 
-    float newX = std::max<float>(std::min<float>(position.x(), maxPos.x()), minPos.x());
-    float newY = std::max<float>(std::min<float>(position.y(), maxPos.y()), minPos.y());
+    float newX = clampTo<float, float>(position.x(), minPos.x(), maxPos.x());
+    float newY = clampTo<float, float>(position.y(), minPos.y(), maxPos.y());
 
     return FloatPoint(newX, newY);
 }
 
 void ScrollAnimatorMac::immediateScrollTo(const FloatPoint& newPosition)
 {
     FloatPoint adjustedPosition = adjustScrollPositionIfNecessary(newPosition);
 
     bool positionChanged = adjustedPosition.x() != m_currentPosX || adjustedPosition.y() != m_currentPosY;
     if (!positionChanged && !scrollableArea()->scrollOriginChanged())
@@ skipping 413 matching lines @@
         return;
 
     m_visibleScrollerThumbRect = rectInViewCoordinates;
 }
 
 bool ScrollAnimatorMac::canUseCoordinatedScrollbar() {
     return ScrollbarThemeMacCommon::isOverlayAPIAvailable();
 }
 
 } // namespace blink