summaryrefslogtreecommitdiffstats
path: root/cc/page_scale_animation.cc
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-09 22:15:30 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-09 22:15:30 +0000
commitb0c369a9b86783b4e8fe87ea9042b2cad1c9a47e (patch)
tree64d45d8da44798115648c0427cc2aeb58e58f679 /cc/page_scale_animation.cc
parentd43bf845ce4d1010f6e7923f43dd1766183ec18d (diff)
downloadchromium_src-b0c369a9b86783b4e8fe87ea9042b2cad1c9a47e.zip
chromium_src-b0c369a9b86783b4e8fe87ea9042b2cad1c9a47e.tar.gz
chromium_src-b0c369a9b86783b4e8fe87ea9042b2cad1c9a47e.tar.bz2
ui: Add non-member Vector2dScale() and Vector3dScale() methods to create scaled vectors
These behave like similar methods for Rect/Point/Size. Tests: ui_unittests:Vector2dTest.Scale ui_unittests:Vector3dTest.Scale R=sky BUG=160158 Review URL: https://codereview.chromium.org/11293193 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166993 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/page_scale_animation.cc')
-rw-r--r--cc/page_scale_animation.cc11
1 files changed, 3 insertions, 8 deletions
diff --git a/cc/page_scale_animation.cc b/cc/page_scale_animation.cc
index 877cacb..719a403 100644
--- a/cc/page_scale_animation.cc
+++ b/cc/page_scale_animation.cc
@@ -22,16 +22,12 @@ gfx::PointF toPointF(const gfx::Vector2dF& vector)
// between 0 and 1, representing the percentage position within the viewport.
gfx::Vector2dF normalizeFromViewport(const gfx::Vector2dF& denormalized, const gfx::SizeF& viewportSize)
{
- gfx::Vector2dF normalized(denormalized);
- normalized.Scale(1 / viewportSize.width(), 1 / viewportSize.height());
- return normalized;
+ return gfx::ScaleVector2d(denormalized, 1 / viewportSize.width(), 1 / viewportSize.height());
}
gfx::Vector2dF denormalizeToViewport(const gfx::Vector2dF& normalized, const gfx::SizeF& viewportSize)
{
- gfx::Vector2dF denormalized(normalized);
- denormalized.Scale(viewportSize.width(), viewportSize.height());
- return denormalized;
+ return gfx::ScaleVector2d(normalized, viewportSize.width(), viewportSize.height());
}
gfx::Vector2dF interpolateBetween(const gfx::Vector2dF& start, const gfx::Vector2dF end, float interp)
@@ -183,8 +179,7 @@ gfx::Vector2dF PageScaleAnimation::scrollOffsetAt(float interp) const
gfx::Vector2dF PageScaleAnimation::anchorAt(float interp) const
{
// Interpolate from start to target anchor in absolute space.
- gfx::Vector2dF delta = m_targetAnchor - m_startAnchor;
- delta.Scale(interp);
+ gfx::Vector2dF delta = gfx::ScaleVector2d(m_targetAnchor - m_startAnchor, interp);
return m_startAnchor + delta;
}