wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-21 14:47:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #1619 - Nits Picked

Browse source
This commit is contained in:
Andy 2020-08-02 08:01:58 -07:00 • committed by Roy Tam
commit f15f44b445
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
layout/generic/nsFlexContainerFrame.cpp
View file

@ -1529,9 +1529,9 @@ MainSizeFromAspectRatio(nscoord aCrossSize,
{ {
MOZ_ASSERT(aIntrinsicRatio, MOZ_ASSERT(aIntrinsicRatio,
"Invalid ratio; will divide by 0! Caller should've checked..."); "Invalid ratio; will divide by 0! Caller should've checked...");
AspectRatio ratio = aAxisTracker.IsMainAxisHorizontal() AspectRatio ratio = aAxisTracker.IsMainAxisHorizontal() ?
? aIntrinsicRatio aIntrinsicRatio :
: aIntrinsicRatio.Inverted(); aIntrinsicRatio.Inverted();
return ratio.ApplyTo(aCrossSize); return ratio.ApplyTo(aCrossSize);
} }

1
layout/generic/nsHTMLCanvasFrame.cpp
View file

@ -199,6 +199,7 @@ nsHTMLCanvasFrame::GetIntrinsicSize()
/* virtual */ AspectRatio /* virtual */ AspectRatio
nsHTMLCanvasFrame::GetIntrinsicRatio() nsHTMLCanvasFrame::GetIntrinsicRatio()
{ {
// When 'contain: size' is implemented, make sure to check for it.
/* /*
if (StyleDisplay()->IsContainSize()) { if (StyleDisplay()->IsContainSize()) {
return AspectRatio(); return AspectRatio();

6
layout/generic/nsVideoFrame.cpp
View file

@ -531,9 +531,9 @@ nsVideoFrame::ComputeSize(nsRenderingContext *aRenderingContext,
intrinsicSize.height.SetCoordValue(size.height); intrinsicSize.height.SetCoordValue(size.height);
// Only video elements have an intrinsic ratio. // Only video elements have an intrinsic ratio.
auto intrinsicRatio = HasVideoElement() auto intrinsicRatio = HasVideoElement() ?
? AspectRatio::FromSize(size) AspectRatio::FromSize(size) :
: AspectRatio(); AspectRatio();
return ComputeSizeWithIntrinsicDimensions(aRenderingContext, aWM, return ComputeSizeWithIntrinsicDimensions(aRenderingContext, aWM,
intrinsicSize, intrinsicRatio, intrinsicSize, intrinsicRatio,

3
layout/xul/nsImageBoxFrame.cpp
View file

@ -407,8 +407,7 @@ nsImageBoxFrame::PaintImage(nsRenderingContext& aRenderingContext,
// Image has a valid size; use it as intrinsic size & ratio. // Image has a valid size; use it as intrinsic size & ratio.
intrinsicSize.width.SetCoordValue(mIntrinsicSize.width); intrinsicSize.width.SetCoordValue(mIntrinsicSize.width);
intrinsicSize.height.SetCoordValue(mIntrinsicSize.height); intrinsicSize.height.SetCoordValue(mIntrinsicSize.height);
intrinsicRatio = intrinsicRatio = AspectRatio::FromSize(mIntrinsicSize);
AspectRatio::FromSize(mIntrinsicSize);
} else { } else {
// Image doesn't have a (valid) intrinsic size. // Image doesn't have a (valid) intrinsic size.
// Try to look up intrinsic ratio and use that at least. // Try to look up intrinsic ratio and use that at least.