Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1752658 Part 7 - Generalize GenerateFlexLines to populate FlexLayoutResult. r=dholbert

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D138101
This commit is contained in:
Ting-Yu Lin 2022-02-08 22:47:20 +00:00
parent 141dbba00c
commit ae6fa4834c
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
layout/generic/nsFlexContainerFrame.cpp
View File

@ -4233,12 +4233,17 @@ void nsFlexContainerFrame::GenerateFlexLines(
}
}
void nsFlexContainerFrame::GenerateFlexLines(const SharedFlexData& aData,
nsTArray<FlexLine>& aLines) {
nsFlexContainerFrame::FlexLayoutResult
nsFlexContainerFrame::GenerateFlexLayoutResult() {
MOZ_ASSERT(GetPrevInFlow(), "This should be called by non-first-in-flows!");
auto* data = FirstInFlow()->GetProperty(SharedFlexData::Prop());
MOZ_ASSERT(data, "SharedFlexData should be set by our first-in-flow!");
FlexLayoutResult flr;
// Pretend we have only one line and zero main gap size.
aLines.AppendElement(FlexLine(0));
flr.mLines.AppendElement(FlexLine(0));
// The order state of the children is consistent across entire continuation
// chain due to calling nsContainerFrame::NormalizeChildLists() at the
@ -4255,7 +4260,7 @@ void nsFlexContainerFrame::GenerateFlexLines(const SharedFlexData& aData,
CSSOrderAwareFrameIterator::ChildFilter::SkipPlaceholders,
OrderStateForIter(this), OrderingPropertyForIter(this));
FlexItemIterator itemIter(aData.mLines);
FlexItemIterator itemIter(data->mLines);
for (; !iter.AtEnd(); iter.Next()) {
nsIFrame* const child = *iter;
@ -4266,12 +4271,17 @@ void nsFlexContainerFrame::GenerateFlexLines(const SharedFlexData& aData,
for (; !itemIter.AtEnd(); itemIter.Next()) {
if (itemIter->Frame() == childFirstInFlow) {
aLines[0].Items().AppendElement(itemIter->CloneFor(child));
flr.mLines[0].Items().AppendElement(itemIter->CloneFor(child));
itemIter.Next();
break;
}
}
}
flr.mContentBoxMainSize = data->mContentBoxMainSize;
flr.mContentBoxCrossSize = data->mContentBoxCrossSize;
return flr;
}
// Returns the largest outer hypothetical main-size of any line in |aLines|.
@ -4600,12 +4610,7 @@ void nsFlexContainerFrame::Reflow(nsPresContext* aPresContext,
containerInfo);
}
} else {
auto* data = FirstInFlow()->GetProperty(SharedFlexData::Prop());
MOZ_ASSERT(data, "SharedFlexData should be set by our first-in-flow!");
GenerateFlexLines(*data, flr.mLines);
flr.mContentBoxMainSize = data->mContentBoxMainSize;
flr.mContentBoxCrossSize = data->mContentBoxCrossSize;
flr = GenerateFlexLayoutResult();
}
const LogicalSize contentBoxSize =

9
layout/generic/nsFlexContainerFrame.h
View File

@ -456,12 +456,11 @@ class nsFlexContainerFrame final : public nsContainerFrame {
nsTArray<FlexLine>& aLines);
/**
* This method creates FlexLines and FlexItems for children in flex
* container's next-in-flows by using the SharedFlexData stored in flex
* container's first-in-flow. Returns FlexLines in the outparam |aLines|.
* Generates and returns a FlexLayoutResult that contains the FlexLines and
* some sizing metrics that should be used to lay out a particular flex
* container continuation (i.e. don't call this on the first-in-flow).
*/
void GenerateFlexLines(const SharedFlexData& aData,
nsTArray<FlexLine>& aLines);
FlexLayoutResult GenerateFlexLayoutResult();
/**
* Resolves the content-box main-size of a flex container frame,