cc/layer_impl.cc - Issue 11361186: ui: Add methods to clamp Sizes, Points, and Vectors from above or below.

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

Issue 11361186: ui: Add methods to clamp Sizes, Points, and Vectors from above or below. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years, 1 month 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

Index: cc/layer_impl.cc

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

index 6bb093b27ce11f51cc24ccf6a29dd848000afe26..fe443e02de04c4e279634f1ca92455895308135f 100644

--- a/cc/layer_impl.cc

+++ b/cc/layer_impl.cc

@@ -184,8 +184,8 @@ gfx::Vector2dF LayerImpl::scrollBy(const gfx::Vector2dF& scroll)

gfx::Vector2dF maxDelta = m_maxScrollOffset - m_scrollOffset;

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

gfx::Vector2dF newDelta = (m_scrollDelta + scroll);

- newDelta = ClampFromBelow(newDelta, minDelta);

- newDelta = ClampFromAbove(newDelta, maxDelta);

+ newDelta.ClampToMin(minDelta);

+ newDelta.ClampToMax(maxDelta);

gfx::Vector2dF unscrolled = m_scrollDelta + scroll - newDelta;

if (m_scrollDelta == newDelta)

« no previous file with comments | « cc/geometry.h ('k') | cc/layer_tree_host_impl.cc » ('j') | no next file with comments »