diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-10 00:07:59 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-10 00:07:59 +0000 |
| commit | fe07b6440c1a545943f15099f884ee989c9f0705 (patch) | |
| tree | 9d9495e767a7eb4de2050d62118953acbb851eef /cc/layer_impl.cc | |
| parent | 0175b30c6c73ce2c2fc9633b98683d71b4fafcaa (diff) | |
| download | chromium_src-fe07b6440c1a545943f15099f884ee989c9f0705.zip chromium_src-fe07b6440c1a545943f15099f884ee989c9f0705.tar.gz chromium_src-fe07b6440c1a545943f15099f884ee989c9f0705.tar.bz2 | |
ui: Add methods to clamp Sizes, Points, and Vectors from above or below.
Tests:
PointTest.Clamp
PointTest.ClampF
SizeTest.Clamp
SizeTest.ClampF
Vector2dTest.Clamp
Vector2dTest.ClampF
Vector3dTest.ClampF
R=sky,enne
BUG=147395
Review URL: https://codereview.chromium.org/11361186
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167014 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer_impl.cc')
| -rw-r--r-- | cc/layer_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc index e53f44e..4598621 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) |