third_party/WebKit/Source/platform/scroll/ScrollAnimatorBase.cpp - Issue 1530723004: Use clampTo instead of chaining std::max(std::min(...))

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/scroll/ScrollAnimatorBase.cpp

Issue 1530723004: Use clampTo instead of chaining std::max(std::min(...)) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: More rebase Created 5 years 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

« no previous file with comments | « third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm ('k') | third_party/WebKit/Source/platform/scroll/ScrollableArea.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/scroll/ScrollAnimatorBase.cpp

diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorBase.cpp b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorBase.cpp

index 2858a072c4188cbca4f18427bb4028cde18952a4..ce86e06d66f7a30a0aa006d9a638a42e91b32838 100644

--- a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorBase.cpp

+++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorBase.cpp

@@ -33,8 +33,8 @@

#include "platform/RuntimeEnabledFeatures.h"

#include "platform/geometry/FloatPoint.h"

#include "platform/scroll/ScrollableArea.h"

+#include "wtf/MathExtras.h"

#include "wtf/PassOwnPtr.h"

-#include <algorithm>

namespace blink {

@@ -98,7 +98,7 @@ float ScrollAnimatorBase::clampScrollPosition(ScrollbarOrientation orientation,

{

float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation);

float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation);

- return std::max(std::min(pos, maxScrollPos), minScrollPos);

+ return clampTo(pos, minScrollPos, maxScrollPos);

}

DEFINE_TRACE(ScrollAnimatorBase)