cc/layers/layer_impl.cc - Issue 14367021: Rename ClampToMin and ClampToMax

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: cc/layers/layer_impl.cc

Issue 14367021: Rename ClampToMin and ClampToMax (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 7 years, 8 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:

Index: cc/layers/layer_impl.cc

diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc

index ab32cb83af11b367a264baaa19b80e35a1417a8c..0b14084c77c26dd94669e451d675ae4b8cd705c7 100644

--- a/cc/layers/layer_impl.cc

+++ b/cc/layers/layer_impl.cc

@@ -215,8 +215,8 @@ gfx::Vector2dF LayerImpl::ScrollBy(gfx::Vector2dF scroll) {

gfx::Vector2dF max_delta = max_scroll_offset_ - scroll_offset_;

// Clamp new_delta so that position + delta stays within scroll bounds.

gfx::Vector2dF new_delta = (scroll_delta_ + scroll);

- new_delta.ClampToMin(min_delta);

- new_delta.ClampToMax(max_delta);

+ new_delta.ClampToLowerBound(min_delta);

+ new_delta.ClampToUpperBound(max_delta);

gfx::Vector2dF unscrolled = scroll_delta_ + scroll - new_delta;

SetScrollDelta(new_delta);