diff options
author | aelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 06:51:44 +0000 |
---|---|---|
committer | aelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 06:51:44 +0000 |
commit | 69a2a5be71022a23aeef22ee6661cf3e01314326 (patch) | |
tree | 3ad8e48399c0a076a44cfaa5d20f9316b2190f04 /cc/layer_tree_host_impl.cc | |
parent | 6c2abf95fb4194f567fd35803acc4529f1577003 (diff) | |
download | chromium_src-69a2a5be71022a23aeef22ee6661cf3e01314326.zip chromium_src-69a2a5be71022a23aeef22ee6661cf3e01314326.tar.gz chromium_src-69a2a5be71022a23aeef22ee6661cf3e01314326.tar.bz2 |
cc: Clean up PageScaleAnimation for readability.
No-op change.
BUG=152505
Review URL: https://chromiumcodereview.appspot.com/11364189
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer_tree_host_impl.cc')
-rw-r--r-- | cc/layer_tree_host_impl.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc index 01afc00..56b16e57 100644 --- a/cc/layer_tree_host_impl.cc +++ b/cc/layer_tree_host_impl.cc @@ -288,7 +288,7 @@ void LayerTreeHostImpl::animate(base::TimeTicks monotonicTime, base::Time wallCl animateScrollbars(monotonicTime); } -void LayerTreeHostImpl::startPageScaleAnimation(gfx::Vector2d targetPosition, bool anchorPoint, float pageScale, base::TimeTicks startTime, base::TimeDelta duration) +void LayerTreeHostImpl::startPageScaleAnimation(gfx::Vector2d targetOffset, bool anchorPoint, float pageScale, base::TimeTicks startTime, base::TimeDelta duration) { if (!m_rootScrollLayerImpl) return; @@ -305,15 +305,15 @@ void LayerTreeHostImpl::startPageScaleAnimation(gfx::Vector2d targetPosition, bo m_pageScaleAnimation = PageScaleAnimation::create(scrollTotal, m_pinchZoomViewport.totalPageScaleFactor(), viewportSize, scaledContentSize, startTimeSeconds); if (anchorPoint) { - gfx::Vector2dF anchor(targetPosition); + gfx::Vector2dF anchor(targetOffset); if (!Settings::pageScalePinchZoomEnabled()) anchor.Scale(1 / pageScale); m_pageScaleAnimation->zoomWithAnchor(anchor, pageScale, duration.InSecondsF()); } else { - gfx::Vector2dF scaledTargetPosition = targetPosition; + gfx::Vector2dF scaledTargetOffset = targetOffset; if (!Settings::pageScalePinchZoomEnabled()) - scaledTargetPosition.Scale(1 / pageScale); - m_pageScaleAnimation->zoomTo(scaledTargetPosition, pageScale, duration.InSecondsF()); + scaledTargetOffset.Scale(1 / pageScale); + m_pageScaleAnimation->zoomTo(scaledTargetOffset, pageScale, duration.InSecondsF()); } m_client->setNeedsRedrawOnImplThread(); |