diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-08-31 05:54:39 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-08-31 05:54:39 +0000 |
| commit | a6f632714fcb1be3dd00b0fc76fbf6bfc693155b (patch) | |
| tree | b04c82f9af4a0d288a6d4350d774ad8fe6dac903 /layout/base/nsLayoutUtils.h | |
| parent | 2ed0607c747b21cadaf7401d4ba706097578e74d (diff) | |
| parent | b28effe2ea93e43e362f7ce263d23b55adcb6da7 (diff) | |
| download | UXP-a6f632714fcb1be3dd00b0fc76fbf6bfc693155b.tar UXP-a6f632714fcb1be3dd00b0fc76fbf6bfc693155b.tar.gz UXP-a6f632714fcb1be3dd00b0fc76fbf6bfc693155b.tar.lz UXP-a6f632714fcb1be3dd00b0fc76fbf6bfc693155b.tar.xz UXP-a6f632714fcb1be3dd00b0fc76fbf6bfc693155b.zip | |
Merge branch 'redwood' into releaseRELBASE_20200831
Diffstat (limited to 'layout/base/nsLayoutUtils.h')
| -rw-r--r-- | layout/base/nsLayoutUtils.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/layout/base/nsLayoutUtils.h b/layout/base/nsLayoutUtils.h index bba1f3265..f4471ce74 100644 --- a/layout/base/nsLayoutUtils.h +++ b/layout/base/nsLayoutUtils.h @@ -65,6 +65,7 @@ struct nsStyleImageOrientation; struct nsOverflowAreas; namespace mozilla { +struct aspectRatio; enum class CSSPseudoElementType : uint8_t; class EventListenerManager; class SVGImageContext; @@ -126,6 +127,7 @@ enum class RelativeTo { */ class nsLayoutUtils { + typedef mozilla::AspectRatio AspectRatio; typedef mozilla::dom::DOMRectList DOMRectList; typedef mozilla::layers::Layer Layer; typedef mozilla::ContainerLayerParameters ContainerLayerParameters; @@ -1258,7 +1260,7 @@ public: */ static nsRect ComputeObjectDestRect(const nsRect& aConstraintRect, const IntrinsicSize& aIntrinsicSize, - const nsSize& aIntrinsicRatio, + const AspectRatio& aIntrinsicRatio, const nsStylePosition* aStylePos, nsPoint* aAnchorPoint = nullptr); @@ -1878,7 +1880,7 @@ public: */ static void ComputeSizeForDrawing(imgIContainer* aImage, CSSIntSize& aImageSize, - nsSize& aIntrinsicRatio, + AspectRatio& aIntrinsicRatio, bool& aGotWidth, bool& aGotHeight); |