mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-13 21:35:39 +00:00
Bug 1173858 - Part 3 - Reindent blocks that we've converted to use LAYOUT_WARN_IF_FALSE. r=dholbert
This commit is contained in:
parent
efa4d9e28e
commit
61b43b582d
@ -113,9 +113,9 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
|
||||
mNextInFlow = static_cast<nsBlockFrame*>(mBlock->GetNextInFlow());
|
||||
|
||||
LAYOUT_WARN_IF_FALSE(NS_UNCONSTRAINEDSIZE != aReflowState.ComputedISize(),
|
||||
"have unconstrained width; this should only result from "
|
||||
"very large sizes, not attempts at intrinsic width "
|
||||
"calculation");
|
||||
"have unconstrained width; this should only result "
|
||||
"from very large sizes, not attempts at intrinsic "
|
||||
"width calculation");
|
||||
mContentArea.ISize(wm) = aReflowState.ComputedISize();
|
||||
|
||||
// Compute content area height. Unlike the width, if we have a
|
||||
|
@ -359,9 +359,9 @@ nsHTMLReflowState::Init(nsPresContext* aPresContext,
|
||||
}
|
||||
|
||||
LAYOUT_WARN_IF_FALSE(AvailableISize() != NS_UNCONSTRAINEDSIZE,
|
||||
"have unconstrained inline-size; this should only result from "
|
||||
"very large sizes, not attempts at intrinsic inline-size "
|
||||
"calculation");
|
||||
"have unconstrained inline-size; this should only "
|
||||
"result from very large sizes, not attempts at "
|
||||
"intrinsic inline-size calculation");
|
||||
|
||||
mStylePosition = frame->StylePosition();
|
||||
mStyleDisplay = frame->StyleDisplay();
|
||||
@ -448,12 +448,12 @@ nsHTMLReflowState::Init(nsPresContext* aPresContext,
|
||||
}
|
||||
|
||||
LAYOUT_WARN_IF_FALSE((mFrameType == NS_CSS_FRAME_TYPE_INLINE &&
|
||||
!frame->IsFrameOfType(nsIFrame::eReplaced)) ||
|
||||
type == nsGkAtoms::textFrame ||
|
||||
ComputedISize() != NS_UNCONSTRAINEDSIZE,
|
||||
"have unconstrained inline-size; this should only result from "
|
||||
"very large sizes, not attempts at intrinsic inline-size "
|
||||
"calculation");
|
||||
!frame->IsFrameOfType(nsIFrame::eReplaced)) ||
|
||||
type == nsGkAtoms::textFrame ||
|
||||
ComputedISize() != NS_UNCONSTRAINEDSIZE,
|
||||
"have unconstrained inline-size; this should only "
|
||||
"result from very large sizes, not attempts at "
|
||||
"intrinsic inline-size calculation");
|
||||
}
|
||||
|
||||
void nsHTMLReflowState::InitCBReflowState()
|
||||
@ -2455,10 +2455,10 @@ nsHTMLReflowState::CalculateBlockSideMargins(nsIAtom* aFrameType)
|
||||
}
|
||||
|
||||
LAYOUT_WARN_IF_FALSE(NS_UNCONSTRAINEDSIZE != computedISizeCBWM &&
|
||||
NS_UNCONSTRAINEDSIZE != availISizeCBWM,
|
||||
"have unconstrained inline-size; this should only result from "
|
||||
"very large sizes, not attempts at intrinsic inline-size "
|
||||
"calculation");
|
||||
NS_UNCONSTRAINEDSIZE != availISizeCBWM,
|
||||
"have unconstrained inline-size; this should only "
|
||||
"result from very large sizes, not attempts at "
|
||||
"intrinsic inline-size calculation");
|
||||
|
||||
LogicalMargin margin =
|
||||
ComputedLogicalMargin().ConvertTo(cbWM, mWritingMode);
|
||||
|
@ -156,9 +156,9 @@ nsLineLayout::BeginLineReflow(nscoord aICoord, nscoord aBCoord,
|
||||
{
|
||||
NS_ASSERTION(nullptr == mRootSpan, "bad linelayout user");
|
||||
LAYOUT_WARN_IF_FALSE(aISize != NS_UNCONSTRAINEDSIZE,
|
||||
"have unconstrained width; this should only result from "
|
||||
"very large sizes, not attempts at intrinsic width "
|
||||
"calculation");
|
||||
"have unconstrained width; this should only result from "
|
||||
"very large sizes, not attempts at intrinsic width "
|
||||
"calculation");
|
||||
#ifdef DEBUG
|
||||
if ((aISize != NS_UNCONSTRAINEDSIZE) && CRAZY_SIZE(aISize)) {
|
||||
nsFrame::ListTag(stdout, mBlockReflowState->frame);
|
||||
@ -880,9 +880,9 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
|
||||
// everything else does. We need to give them an available width that
|
||||
// reflects the space left on the line.
|
||||
LAYOUT_WARN_IF_FALSE(psd->mIEnd != NS_UNCONSTRAINEDSIZE,
|
||||
"have unconstrained width; this should only result from "
|
||||
"very large sizes, not attempts at intrinsic width "
|
||||
"calculation");
|
||||
"have unconstrained width; this should only result from "
|
||||
"very large sizes, not attempts at intrinsic width "
|
||||
"calculation");
|
||||
nscoord availableSpaceOnLine = psd->mIEnd - psd->mICoord;
|
||||
|
||||
// Setup reflow state for reflowing the frame
|
||||
@ -3054,9 +3054,9 @@ nsLineLayout::TextAlignLine(nsLineBox* aLine,
|
||||
PerSpanData* psd = mRootSpan;
|
||||
WritingMode lineWM = psd->mWritingMode;
|
||||
LAYOUT_WARN_IF_FALSE(psd->mIEnd != NS_UNCONSTRAINEDSIZE,
|
||||
"have unconstrained width; this should only result from "
|
||||
"very large sizes, not attempts at intrinsic width "
|
||||
"calculation");
|
||||
"have unconstrained width; this should only result from "
|
||||
"very large sizes, not attempts at intrinsic width "
|
||||
"calculation");
|
||||
nscoord availISize = psd->mIEnd - psd->mIStart;
|
||||
nscoord remainingISize = availISize - aLine->ISize();
|
||||
#ifdef NOISY_INLINEDIR_ALIGN
|
||||
|
Loading…
Reference in New Issue
Block a user