Bug 958714 Remove obsolete assertion & comment

+ Used "mFrame->GetType()" instead of "mFrame->Type()"
This commit is contained in:
janekptacijarabaci 2018-07-20 09:15:48 +02:00 • committed by Roy Tam
commit b2c7373dba

View file

@ -154,11 +154,6 @@ FontSizeInflationListMarginAdjustment(const nsIFrame* aFrame)
return 0; return 0;
} }
// NOTE: If we ever want to use SizeComputationInput for a flex item or a
// grid item, we need to make it take the containing-block block-size as
// well as the inline-size, since flex items and grid items resolve
// block-direction percent margins and padding against the
// containing-block block-size, rather than its inline-size.
SizeComputationInput::SizeComputationInput(nsIFrame *aFrame, SizeComputationInput::SizeComputationInput(nsIFrame *aFrame,
nsRenderingContext *aRenderingContext, nsRenderingContext *aRenderingContext,
WritingMode aContainingBlockWritingMode, WritingMode aContainingBlockWritingMode,
@ -167,15 +162,9 @@ SizeComputationInput::SizeComputationInput(nsIFrame *aFrame,
, mRenderingContext(aRenderingContext) , mRenderingContext(aRenderingContext)
, mWritingMode(aFrame->GetWritingMode()) , mWritingMode(aFrame->GetWritingMode())
{ {
MOZ_ASSERT(!aFrame->IsFlexOrGridItem(),
"We're about to resolve percent margin & padding "
"values against CB inline size, which is incorrect for "
"flex/grid items. "
"Additionally for grid items, this path doesn't handle baseline "
"padding contribution - see SizeComputationInput::InitOffsets");
ReflowInputFlags flags; ReflowInputFlags flags;
InitOffsets(aContainingBlockWritingMode, aContainingBlockISize, InitOffsets(aContainingBlockWritingMode, aContainingBlockISize,
mFrame->Type(), flags); mFrame->GetType(), flags);
} }
// Initialize a reflow state for a child frame's reflow. Some state // Initialize a reflow state for a child frame's reflow. Some state