Index: third_party/WebKit/Source/platform/scroll/ScrollableArea.h |
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollableArea.h b/third_party/WebKit/Source/platform/scroll/ScrollableArea.h |
index 26512f66055fb27979c0abaab18f233c795493d9..71e221bbd15f913d2a60449e7668185339b547c0 100644 |
--- a/third_party/WebKit/Source/platform/scroll/ScrollableArea.h |
+++ b/third_party/WebKit/Source/platform/scroll/ScrollableArea.h |
@@ -33,6 +33,7 @@ |
#include "platform/scroll/ScrollAnimatorBase.h" |
#include "platform/scroll/ScrollTypes.h" |
#include "platform/scroll/Scrollbar.h" |
+#include "wtf/MathExtras.h" |
#include "wtf/Noncopyable.h" |
#include "wtf/Vector.h" |
@@ -231,7 +232,7 @@ public: |
int scrollPosition(ScrollbarOrientation orientation) { return orientation == HorizontalScrollbar ? scrollPosition().x() : scrollPosition().y(); } |
int minimumScrollPosition(ScrollbarOrientation orientation) { return orientation == HorizontalScrollbar ? minimumScrollPosition().x() : minimumScrollPosition().y(); } |
int maximumScrollPosition(ScrollbarOrientation orientation) { return orientation == HorizontalScrollbar ? maximumScrollPosition().x() : maximumScrollPosition().y(); } |
- int clampScrollPosition(ScrollbarOrientation orientation, int pos) { return std::max(std::min(pos, maximumScrollPosition(orientation)), minimumScrollPosition(orientation)); } |
+ int clampScrollPosition(ScrollbarOrientation orientation, int pos) { return clampTo(pos, minimumScrollPosition(orientation), maximumScrollPosition(orientation)); } |
virtual GraphicsLayer* layerForContainer() const; |
virtual GraphicsLayer* layerForScrolling() const { return 0; } |