mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1024875: Make reflow-related functions in nsFlexContainerFrame return void, now that Reflow returns void. r=mats
This commit is contained in:
parent
45e852ca76
commit
1aa2afe367
@ -1056,7 +1056,7 @@ nsFlexContainerFrame::GenerateFlexItemForChild(
|
||||
return item;
|
||||
}
|
||||
|
||||
nsresult
|
||||
void
|
||||
nsFlexContainerFrame::
|
||||
ResolveFlexItemMaxContentSizing(nsPresContext* aPresContext,
|
||||
FlexItem& aFlexItem,
|
||||
@ -1066,7 +1066,7 @@ nsFlexContainerFrame::
|
||||
if (IsAxisHorizontal(aAxisTracker.GetMainAxis())) {
|
||||
// Nothing to do -- this function is only for measuring flex items
|
||||
// in a vertical flex container.
|
||||
return NS_OK;
|
||||
return;
|
||||
}
|
||||
|
||||
if (NS_AUTOHEIGHT != aFlexItem.GetFlexBaseSize()) {
|
||||
@ -1074,7 +1074,7 @@ nsFlexContainerFrame::
|
||||
// with a base size of "auto" (or equivalent).
|
||||
// XXXdholbert If & when we handle "min-height: min-content" for flex items,
|
||||
// we'll want to resolve that in this function, too.
|
||||
return NS_OK;
|
||||
return;
|
||||
}
|
||||
|
||||
// If we get here, we're vertical and our main size ended up being
|
||||
@ -1148,8 +1148,6 @@ nsFlexContainerFrame::
|
||||
|
||||
aFlexItem.SetFlexBaseSizeAndMainSize(childDesiredHeight);
|
||||
aFlexItem.SetHadMeasuringReflow();
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
FlexItem::FlexItem(nsIFrame* aChildFrame,
|
||||
@ -2623,7 +2621,7 @@ AddNewFlexLineToList(LinkedList<FlexLine>& aLines,
|
||||
return newLine;
|
||||
}
|
||||
|
||||
nsresult
|
||||
void
|
||||
nsFlexContainerFrame::GenerateFlexLines(
|
||||
nsPresContext* aPresContext,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
@ -2706,9 +2704,8 @@ nsFlexContainerFrame::GenerateFlexLines(
|
||||
item = GenerateFlexItemForChild(aPresContext, childFrame,
|
||||
aReflowState, aAxisTracker);
|
||||
|
||||
nsresult rv = ResolveFlexItemMaxContentSizing(aPresContext, *item,
|
||||
ResolveFlexItemMaxContentSizing(aPresContext, *item,
|
||||
aReflowState, aAxisTracker);
|
||||
NS_ENSURE_SUCCESS(rv,rv);
|
||||
}
|
||||
|
||||
nscoord itemInnerHypotheticalMainSize = item->GetMainSize();
|
||||
@ -2738,8 +2735,6 @@ nsFlexContainerFrame::GenerateFlexLines(
|
||||
}
|
||||
itemIdxInContainer++;
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
// Retrieves the content-box main-size of our flex container from the
|
||||
@ -2945,7 +2940,7 @@ ComputePhysicalAscentFromLogicalAscent(nscoord aLogicalAscent,
|
||||
aAxisTracker.GetCrossAxis());
|
||||
}
|
||||
|
||||
nsresult
|
||||
void
|
||||
nsFlexContainerFrame::SizeItemInCrossAxis(
|
||||
nsPresContext* aPresContext,
|
||||
const FlexboxAxisTracker& aAxisTracker,
|
||||
@ -2964,7 +2959,7 @@ nsFlexContainerFrame::SizeItemInCrossAxis(
|
||||
"In vert flex container, we depend on FlexItem constructor to "
|
||||
"convert 'align-self: baseline' to 'align-self: flex-start'");
|
||||
aItem.SetCrossSize(aChildReflowState.ComputedWidth());
|
||||
return NS_OK;
|
||||
return;
|
||||
}
|
||||
|
||||
MOZ_ASSERT(!aItem.HadMeasuringReflow(),
|
||||
@ -3028,8 +3023,6 @@ nsFlexContainerFrame::SizeItemInCrossAxis(
|
||||
ResolveReflowedChildAscent(aItem.Frame(), childDesiredSize);
|
||||
aItem.SetAscent(childDesiredSize.BlockStartAscent());
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
void
|
||||
@ -3129,11 +3122,11 @@ nsFlexContainerFrame::Reflow(nsPresContext* aPresContext,
|
||||
axisTracker);
|
||||
|
||||
nsAutoTArray<StrutInfo, 1> struts;
|
||||
nsresult rv = DoFlexLayout(aPresContext, aDesiredSize, aReflowState, aStatus,
|
||||
DoFlexLayout(aPresContext, aDesiredSize, aReflowState, aStatus,
|
||||
contentBoxMainSize, availableHeightForContent,
|
||||
struts, axisTracker);
|
||||
|
||||
if (NS_SUCCEEDED(rv) && !struts.IsEmpty()) {
|
||||
if (!struts.IsEmpty()) {
|
||||
// We're restarting flex layout, with new knowledge of collapsed items.
|
||||
DoFlexLayout(aPresContext, aDesiredSize, aReflowState, aStatus,
|
||||
contentBoxMainSize, availableHeightForContent,
|
||||
@ -3169,7 +3162,7 @@ private:
|
||||
MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
|
||||
};
|
||||
|
||||
nsresult
|
||||
void
|
||||
nsFlexContainerFrame::DoFlexLayout(nsPresContext* aPresContext,
|
||||
nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
@ -3184,11 +3177,10 @@ nsFlexContainerFrame::DoFlexLayout(nsPresContext* aPresContext,
|
||||
LinkedList<FlexLine> lines;
|
||||
AutoFlexLineListClearer cleanupLines(lines);
|
||||
|
||||
nsresult rv = GenerateFlexLines(aPresContext, aReflowState,
|
||||
GenerateFlexLines(aPresContext, aReflowState,
|
||||
aContentBoxMainSize,
|
||||
aAvailableHeightForContent,
|
||||
aStruts, aAxisTracker, lines);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
aContentBoxMainSize =
|
||||
ClampFlexContainerMainSize(aReflowState, aAxisTracker,
|
||||
@ -3219,9 +3211,8 @@ nsFlexContainerFrame::DoFlexLayout(nsPresContext* aPresContext,
|
||||
childReflowState.SetComputedHeight(item->GetMainSize());
|
||||
}
|
||||
|
||||
nsresult rv = SizeItemInCrossAxis(aPresContext, aAxisTracker,
|
||||
SizeItemInCrossAxis(aPresContext, aAxisTracker,
|
||||
childReflowState, *item);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
}
|
||||
}
|
||||
// Now that we've finished with this line's items, size the line itself:
|
||||
@ -3250,7 +3241,7 @@ nsFlexContainerFrame::DoFlexLayout(nsPresContext* aPresContext,
|
||||
BuildStrutInfoFromCollapsedItems(lines.getFirst(), aStruts);
|
||||
if (!aStruts.IsEmpty()) {
|
||||
// Restart flex layout, using our struts.
|
||||
return NS_OK;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@ -3486,7 +3477,6 @@ nsFlexContainerFrame::DoFlexLayout(nsPresContext* aPresContext,
|
||||
aReflowState, aStatus);
|
||||
|
||||
NS_FRAME_SET_TRUNCATION(aStatus, aReflowState, aDesiredSize)
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
/* virtual */ nscoord
|
||||
|
@ -80,7 +80,7 @@ protected:
|
||||
* to, if we find any visibility:collapse children, and Reflow() does
|
||||
* everything before that point.)
|
||||
*/
|
||||
nsresult DoFlexLayout(nsPresContext* aPresContext,
|
||||
void DoFlexLayout(nsPresContext* aPresContext,
|
||||
nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus,
|
||||
@ -113,10 +113,7 @@ protected:
|
||||
const nsHTMLReflowState& aParentReflowState,
|
||||
const FlexboxAxisTracker& aAxisTracker);
|
||||
|
||||
// Returns nsresult because we might have to reflow aFlexItem.Frame() (to
|
||||
// get its vertical intrinsic size in a vertical flexbox), and if that
|
||||
// reflow fails (returns a failure nsresult), we want to bail out.
|
||||
nsresult ResolveFlexItemMaxContentSizing(nsPresContext* aPresContext,
|
||||
void ResolveFlexItemMaxContentSizing(nsPresContext* aPresContext,
|
||||
FlexItem& aFlexItem,
|
||||
const nsHTMLReflowState& aParentReflowState,
|
||||
const FlexboxAxisTracker& aAxisTracker);
|
||||
@ -125,7 +122,7 @@ protected:
|
||||
// FlexLines. These are returned by reference in |aLines|. Our actual
|
||||
// return value has to be |nsresult|, in case we have to reflow a child
|
||||
// to establish its flex base size and that reflow fails.
|
||||
nsresult GenerateFlexLines(nsPresContext* aPresContext,
|
||||
void GenerateFlexLines(nsPresContext* aPresContext,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nscoord aContentBoxMainSize,
|
||||
nscoord aAvailableHeightForContent,
|
||||
@ -143,7 +140,7 @@ protected:
|
||||
bool* aIsDefinite,
|
||||
nsReflowStatus& aStatus);
|
||||
|
||||
nsresult SizeItemInCrossAxis(nsPresContext* aPresContext,
|
||||
void SizeItemInCrossAxis(nsPresContext* aPresContext,
|
||||
const FlexboxAxisTracker& aAxisTracker,
|
||||
nsHTMLReflowState& aChildReflowState,
|
||||
FlexItem& aItem);
|
||||
|
Loading…
Reference in New Issue
Block a user