diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-09-27 09:05:25 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-09-27 09:05:25 +0200 |
| commit | fbaab39c94a047f2a0b0bfbe6cf24a790cd7e8b5 (patch) | |
| tree | 7b0e57d393cb08a895973cab2d2072cb2b93a77f /layout/svg/nsSVGOuterSVGFrame.cpp | |
| parent | 580084e9e1d0355c96a54a9641df6c1fee894948 (diff) | |
| parent | e3508f55bed8a463d298021633dbc7d079c9d764 (diff) | |
| download | UXP-fbaab39c94a047f2a0b0bfbe6cf24a790cd7e8b5.tar UXP-fbaab39c94a047f2a0b0bfbe6cf24a790cd7e8b5.tar.gz UXP-fbaab39c94a047f2a0b0bfbe6cf24a790cd7e8b5.tar.lz UXP-fbaab39c94a047f2a0b0bfbe6cf24a790cd7e8b5.tar.xz UXP-fbaab39c94a047f2a0b0bfbe6cf24a790cd7e8b5.zip | |
Merge branch 'master' into Basilisk-release
Diffstat (limited to 'layout/svg/nsSVGOuterSVGFrame.cpp')
| -rw-r--r-- | layout/svg/nsSVGOuterSVGFrame.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/layout/svg/nsSVGOuterSVGFrame.cpp b/layout/svg/nsSVGOuterSVGFrame.cpp index aeadccbc5..e1b97bb40 100644 --- a/layout/svg/nsSVGOuterSVGFrame.cpp +++ b/layout/svg/nsSVGOuterSVGFrame.cpp @@ -241,8 +241,9 @@ nsSVGOuterSVGFrame::GetIntrinsicRatio() nsSVGLength2 &height = content->mLengthAttributes[SVGSVGElement::ATTR_HEIGHT]; if (!width.IsPercentage() && !height.IsPercentage()) { - nsSize ratio(NSToCoordRoundWithClamp(width.GetAnimValue(content)), - NSToCoordRoundWithClamp(height.GetAnimValue(content))); + nsSize ratio( + nsPresContext::CSSPixelsToAppUnits(width.GetAnimValue(content)), + nsPresContext::CSSPixelsToAppUnits(height.GetAnimValue(content))); if (ratio.width < 0) { ratio.width = 0; } @@ -272,8 +273,8 @@ nsSVGOuterSVGFrame::GetIntrinsicRatio() if (viewBoxHeight < 0.0f) { viewBoxHeight = 0.0f; } - return nsSize(NSToCoordRoundWithClamp(viewBoxWidth), - NSToCoordRoundWithClamp(viewBoxHeight)); + return nsSize(nsPresContext::CSSPixelsToAppUnits(viewBoxWidth), + nsPresContext::CSSPixelsToAppUnits(viewBoxHeight)); } return nsSVGDisplayContainerFrame::GetIntrinsicRatio(); |