third_party/WebKit/WebCore/svg/SVGPreserveAspectRatio.cpp - Issue 21184: WebKit merge 40722:40785 (part 1)

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: third_party/WebKit/WebCore/svg/SVGPreserveAspectRatio.cpp

Issue 21184: WebKit merge 40722:40785 (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 11 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/WebKit/WebCore/svg/SVGPreserveAspectRatio.cpp

===================================================================

--- third_party/WebKit/WebCore/svg/SVGPreserveAspectRatio.cpp (revision 9391)

+++ third_party/WebKit/WebCore/svg/SVGPreserveAspectRatio.cpp (working copy)

@@ -178,10 +178,10 @@

double svgar = physWidth / physHeight;

if (align() == SVG_PRESERVEASPECTRATIO_NONE) {

- temp.scale(physWidth / logicWidth, physHeight / logicHeight);

+ temp.scaleNonUniform(physWidth / logicWidth, physHeight / logicHeight);

temp.translate(-logicX, -logicY);

} else if (vpar < svgar && (meetOrSlice() == SVG_MEETORSLICE_MEET) || vpar >= svgar && (meetOrSlice() == SVG_MEETORSLICE_SLICE)) {

- temp.scale(physHeight / logicHeight, physHeight / logicHeight);

+ temp.scaleNonUniform(physHeight / logicHeight, physHeight / logicHeight);

if (align() == SVG_PRESERVEASPECTRATIO_XMINYMIN || align() == SVG_PRESERVEASPECTRATIO_XMINYMID || align() == SVG_PRESERVEASPECTRATIO_XMINYMAX)

temp.translate(-logicX, -logicY);

@@ -190,7 +190,7 @@

else

temp.translate(-logicX - (logicWidth - physWidth * logicHeight / physHeight), -logicY);

} else {

- temp.scale(physWidth / logicWidth, physWidth / logicWidth);

+ temp.scaleNonUniform(physWidth / logicWidth, physWidth / logicWidth);

if (align() == SVG_PRESERVEASPECTRATIO_XMINYMIN || align() == SVG_PRESERVEASPECTRATIO_XMIDYMIN || align() == SVG_PRESERVEASPECTRATIO_XMAXYMIN)

temp.translate(-logicX, -logicY);