From 232f987cf45aad65d20e79d283f14c72771c9bc8 Mon Sep 17 00:00:00 2001
From: Andy <webmaster@RealityRipple.com>
Date: Fri, 31 Jul 2020 13:01:18 -0700
Subject: 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
---
layout/xul/nsImageBoxFrame.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'layout/xul')
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.
--
cgit v1.2.3
From a90b8d98e859ae71c74f2a8cb78b24899d879185 Mon Sep 17 00:00:00 2001
From: Andy <webmaster@RealityRipple.com>
Date: Sun, 2 Aug 2020 08:01:58 -0700
Subject: Issue #1619 - Nits Picked
---
layout/xul/nsImageBoxFrame.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'layout/xul')
diff --git a/layout/xul/nsImageBoxFrame.cpp b/layout/xul/nsImageBoxFrame.cpp
index 5286b6d88..aa00c5174 100644
--- a/layout/xul/nsImageBoxFrame.cpp
+++ b/layout/xul/nsImageBoxFrame.cpp
@@ -407,8 +407,7 @@ nsImageBoxFrame::PaintImage(nsRenderingContext& aRenderingContext,
// Image has a valid size; use it as intrinsic size & ratio.
intrinsicSize.width.SetCoordValue(mIntrinsicSize.width);
intrinsicSize.height.SetCoordValue(mIntrinsicSize.height);
- intrinsicRatio =
- AspectRatio::FromSize(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.
--
cgit v1.2.3