diff options
author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-10 09:34:28 +0000 |
---|---|---|
committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-10 09:34:28 +0000 |
commit | 01a15a710b6ffb772bdf8e3827e9f1395d29d814 (patch) | |
tree | e0bf4c1332ac22b7cc939be4b08f2bdafa732a9c /cc/page_scale_animation.cc | |
parent | bcf7636d116fe67fd79d9acca753b1b18f380654 (diff) | |
download | chromium_src-01a15a710b6ffb772bdf8e3827e9f1395d29d814.zip chromium_src-01a15a710b6ffb772bdf8e3827e9f1395d29d814.tar.gz chromium_src-01a15a710b6ffb772bdf8e3827e9f1395d29d814.tar.bz2 |
ui: Make gfx::Size::Scale() mutate the class. Add gfx::ScaleSize() similar to Rect/Point.
Covered by existing unit tests.
R=sky
BUG=160158
Review URL: https://chromiumcodereview.appspot.com/11377068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167077 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/page_scale_animation.cc')
-rw-r--r-- | cc/page_scale_animation.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/page_scale_animation.cc b/cc/page_scale_animation.cc index 5d9e882..e5b1fec 100644 --- a/cc/page_scale_animation.cc +++ b/cc/page_scale_animation.cc @@ -99,7 +99,7 @@ void PageScaleAnimation::zoomWithAnchor(const gfx::Vector2dF& anchor, float targ gfx::SizeF PageScaleAnimation::viewportSizeAtScale(float pageScaleFactor) const { - return gfx::SizeF(m_viewportSize.width() / pageScaleFactor, m_viewportSize.height() / pageScaleFactor); + return gfx::ScaleSize(m_viewportSize, 1 / pageScaleFactor); } void PageScaleAnimation::inferTargetScrollOffsetFromStartAnchor() |