corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1540408 Part 3 - Rename SVGViewBoxRect to SVGViewBox r=dholbert

Browse Source
This commit is contained in:
longsonr
2019-04-10 05:08:14 +01:00
parent 8eec04afdb
commit 632c5be54b
23 changed files with 140 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
layout/svg/nsSVGPatternFrame.cpp
View File

@@ -636,9 +636,9 @@ gfxMatrix nsSVGPatternFrame::ConstructCTM(const SVGAnimatedViewBox &aViewBox,
if (!aViewBox.IsExplicitlySet()) {
return gfxMatrix(scaleX, 0.0, 0.0, scaleY, 0.0, 0.0);
}
const SVGViewBoxRect viewBoxRect = aViewBox.GetAnimValue();
const SVGViewBox viewBox = aViewBox.GetAnimValue();
if (viewBoxRect.height <= 0.0f || viewBoxRect.width <= 0.0f) {
if (viewBox.height <= 0.0f || viewBox.width <= 0.0f) {
return gfxMatrix(0.0, 0.0, 0.0, 0.0, 0.0, 0.0); // singular
}
@@ -664,9 +664,8 @@ gfxMatrix nsSVGPatternFrame::ConstructCTM(const SVGAnimatedViewBox &aViewBox,
}
Matrix tm = SVGContentUtils::GetViewBoxTransform(
viewportWidth * scaleX, viewportHeight * scaleY, viewBoxRect.x,
viewBoxRect.y, viewBoxRect.width, viewBoxRect.height,
GetPreserveAspectRatio());
viewportWidth * scaleX, viewportHeight * scaleY, viewBox.x, viewBox.y,
viewBox.width, viewBox.height, GetPreserveAspectRatio());
return ThebesMatrix(tm);
}