diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
tree | eff41dc61d9f714852212739e6b3738b82a2af87 /layout/tables/BasicTableLayoutStrategy.cpp | |
parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | layout/tables/BasicTableLayoutStrategy.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/layout/tables/BasicTableLayoutStrategy.cpp b/layout/tables/BasicTableLayoutStrategy.cpp index 5cb890c234..b6fe51db59 100644 --- a/layout/tables/BasicTableLayoutStrategy.cpp +++ b/layout/tables/BasicTableLayoutStrategy.cpp @@ -37,7 +37,6 @@ BasicTableLayoutStrategy::~BasicTableLayoutStrategy() = default; /* virtual */ nscoord BasicTableLayoutStrategy::GetMinISize(gfxContext* aRenderingContext) { - DISPLAY_MIN_INLINE_SIZE(mTableFrame, mMinISize); if (mMinISize == NS_INTRINSIC_ISIZE_UNKNOWN) { ComputeIntrinsicISizes(aRenderingContext); } @@ -47,7 +46,6 @@ nscoord BasicTableLayoutStrategy::GetMinISize(gfxContext* aRenderingContext) { /* virtual */ nscoord BasicTableLayoutStrategy::GetPrefISize(gfxContext* aRenderingContext, bool aComputingSize) { - DISPLAY_PREF_INLINE_SIZE(mTableFrame, mPrefISize); NS_ASSERTION((mPrefISize == NS_INTRINSIC_ISIZE_UNKNOWN) == (mPrefISizePctExpand == NS_INTRINSIC_ISIZE_UNKNOWN), "dirtyness out of sync"); @@ -97,18 +95,10 @@ static CellISizeInfo GetISizeInfo(gfxContext* aRenderingContext, // XXX Should we ignore percentage padding? nsIFrame::IntrinsicSizeOffsetData offsets = aFrame->IntrinsicISizeOffsets(); - - // In quirks mode, table cell isize should be content-box, - // but bsize should be border box. - // Because of this historic anomaly, we do not use quirk.css. - // (We can't specify one value of box-sizing for isize and another - // for bsize). - // For this reason, we also do not use box-sizing for just one of - // them, as this may be confusing. - if (isQuirks || stylePos->mBoxSizing == StyleBoxSizing::Content) { + if (stylePos->mBoxSizing == StyleBoxSizing::Content) { boxSizingToBorderEdge = offsets.padding + offsets.border; } else { - // StyleBoxSizing::Border and standards-mode + // StyleBoxSizing::Border minCoord += offsets.padding + offsets.border; prefCoord += offsets.padding + offsets.border; } |