Bug 1798810 - Update calculation of baseline for multicolumn containers. r=layout-reviewers,TYLin

First/Last Baseline should be from highest/lowest baseline in all columns and
spanners.

Differential Revision: https://phabricator.services.mozilla.com/D171261
This commit is contained in:
David Shin
2023-03-08 18:21:48 +00:00
parent fac7cfa57a
commit 1e6e0ab957
10 changed files with 128 additions and 14 deletions

View File

@@ -15,6 +15,7 @@
#include "mozilla/ToString.h"
#include "nsCSSRendering.h"
#include "nsDisplayList.h"
#include "nsIFrameInlines.h"
#include "nsLayoutUtils.h"
using namespace mozilla;
@@ -1295,6 +1296,32 @@ void nsColumnSetFrame::AppendDirectlyOwnedAnonBoxes(
aResult.AppendElement(OwnedAnonBox(column));
}
Maybe<nscoord> nsColumnSetFrame::GetNaturalBaselineBOffset(
WritingMode aWM, BaselineSharingGroup aBaselineGroup) const {
Maybe<nscoord> result;
for (const auto* kid : mFrames) {
auto kidBaseline = kid->GetNaturalBaselineBOffset(aWM, aBaselineGroup);
if (!kidBaseline) {
continue;
}
// The kid frame may not necessarily be aligned with the columnset frame.
LogicalRect kidRect{aWM, kid->GetLogicalNormalPosition(aWM, GetSize()),
kid->GetLogicalSize(aWM)};
if (aBaselineGroup == BaselineSharingGroup::First) {
*kidBaseline += kidRect.BStart(aWM);
} else {
*kidBaseline += (GetLogicalSize().BSize(aWM) - kidRect.BEnd(aWM));
}
// Take the smallest of the baselines (i.e. Closest to border-block-start
// for `BaselineSharingGroup::First`, border-block-end for
// `BaselineSharingGroup::Last`)
if (!result || *kidBaseline < *result) {
result = kidBaseline;
}
}
return result;
}
#ifdef DEBUG
void nsColumnSetFrame::SetInitialChildList(ChildListID aListID,
nsFrameList&& aChildList) {