diff options
author | Andy <webmaster@RealityRipple.com> | 2020-07-31 13:01:18 -0700 |
---|---|---|
committer | Moonchild <moonchild@palemoon.org> | 2020-08-07 21:27:29 +0000 |
commit | 3266e0976ff055aefa49b664966229bbb89d1009 (patch) | |
tree | 41603b23ec1667a191fe0714d72a2d2649d77125 /layout/xul/nsImageBoxFrame.cpp | |
parent | 4433519ae8b7e1cc14e217c3e20d8bca3f9cf2f2 (diff) | |
download | UXP-3266e0976ff055aefa49b664966229bbb89d1009.tar UXP-3266e0976ff055aefa49b664966229bbb89d1009.tar.gz UXP-3266e0976ff055aefa49b664966229bbb89d1009.tar.lz UXP-3266e0976ff055aefa49b664966229bbb89d1009.tar.xz UXP-3266e0976ff055aefa49b664966229bbb89d1009.zip |
Issue #1619 - Convert Intrinsic Ratio to Float
https://bugzilla.mozilla.org/show_bug.cgi?id=1547792
Aspect Ratio handling simplified by using floating point integers:
- Multiplication of value (or inverse value) to a known side for Scaling
- No unequal equal values such as "4/3" vs "8/6" vs "20/15"
- Truly "Empty" aspect ratios, even if one dimension is not 0
Diffstat (limited to 'layout/xul/nsImageBoxFrame.cpp')
-rw-r--r-- | layout/xul/nsImageBoxFrame.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/layout/xul/nsImageBoxFrame.cpp b/layout/xul/nsImageBoxFrame.cpp index e88b502ab..5286b6d88 100644 --- a/layout/xul/nsImageBoxFrame.cpp +++ b/layout/xul/nsImageBoxFrame.cpp @@ -402,12 +402,13 @@ nsImageBoxFrame::PaintImage(nsRenderingContext& aRenderingContext, // Determine dest rect based on intrinsic size & ratio, along with // 'object-fit' & 'object-position' properties: IntrinsicSize intrinsicSize; - nsSize intrinsicRatio; + AspectRatio intrinsicRatio; if (mIntrinsicSize.width > 0 && mIntrinsicSize.height > 0) { // Image has a valid size; use it as intrinsic size & ratio. intrinsicSize.width.SetCoordValue(mIntrinsicSize.width); intrinsicSize.height.SetCoordValue(mIntrinsicSize.height); - intrinsicRatio = mIntrinsicSize; + intrinsicRatio = + AspectRatio::FromSize(mIntrinsicSize); } else { // Image doesn't have a (valid) intrinsic size. // Try to look up intrinsic ratio and use that at least. |