cc/page_scale_animation.cc - Issue 11293193: ui: Add non-member Vector2dScale() and Vector3dScale() methods to create scaled vectors

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

Issue 11293193: ui: Add non-member Vector2dScale() and Vector3dScale() methods to create scaled vectors (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: use it in cc/ 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/page_scale_animation.cc

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

index ce4b372c582bed245b1099d1dd3e54b12c239784..90b1cc164f7d175f5532425221de69f687c23bad 100644

--- a/cc/page_scale_animation.cc

+++ b/cc/page_scale_animation.cc

@@ -75,7 +75,7 @@ void PageScaleAnimation::zoomTo(gfx::Vector2d finalScroll, float finalPageScale,

void PageScaleAnimation::zoomWithAnchor(gfx::Vector2d anchor, float finalPageScale, double duration)

{

m_scrollEnd = m_scrollStart + anchor;

- m_scrollEnd = gfx::ToFlooredVector2d(cc::ScaleVector2d(m_scrollEnd, finalPageScale / m_pageScaleStart));

+ m_scrollEnd = gfx::ToFlooredVector2d(gfx::ScaleVector2d(m_scrollEnd, finalPageScale / m_pageScaleStart));

m_scrollEnd -= anchor;

m_scrollEnd = ClampFromBelow(m_scrollEnd, gfx::Vector2d());

« no previous file with comments | « cc/layer_tree_host_impl_unittest.cc ('k') | ui/gfx/vector2d_f.h » ('j') | ui/gfx/vector2d_f.h » ('J')