Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-01 17:23:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1379474 - Update various ReflowInput variable names to match the new type name. r=xidorn

Browse Source 
MozReview-Commit-ID: 1pMLInpeMGY
This commit is contained in:
Jonathan Watt 2017-06-13 11:45:17 +01:00
parent c9afcc965e
commit b4ab3914e7
12 changed files with 83 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/forms/nsDateTimeControlFrame.h
View File

@ -62,7 +62,7 @@ public:
void Reflow(nsPresContext* aPresContext,
ReflowOutput& aDesiredSize,
const ReflowInput& aReflowState,
const ReflowInput& aReflowInput,
nsReflowStatus& aStatus) override;
// nsIAnonymousContentCreator

111
layout/generic/ReflowInput.cpp
View File

@ -774,8 +774,9 @@ ReflowInput::InitResizeFlags(nsPresContext* aPresContext,
break;
}
if (rs->mFrame->GetStateBits() & NS_FRAME_CONTAINS_RELATIVE_BSIZE)
if (rs->mFrame->GetStateBits() & NS_FRAME_CONTAINS_RELATIVE_BSIZE) {
break; // no need to go further
}
rs->mFrame->AddStateBits(NS_FRAME_CONTAINS_RELATIVE_BSIZE);
// Keep track of whether we've hit the containing block, because
@ -1087,24 +1088,25 @@ ReflowInput::GetHypotheticalBoxContainer(nsIFrame* aFrame,
/* Now aFrame is the containing block we want */
/* Check whether the containing block is currently being reflowed.
If so, use the info from the reflow state. */
const ReflowInput* state;
If so, use the info from the reflow input. */
const ReflowInput* reflowInput;
if (aFrame->GetStateBits() & NS_FRAME_IN_REFLOW) {
for (state = mParentReflowInput; state && state->mFrame != aFrame;
state = state->mParentReflowInput) {
for (reflowInput = mParentReflowInput;
reflowInput && reflowInput->mFrame != aFrame;
reflowInput = reflowInput->mParentReflowInput) {
/* do nothing */
}
} else {
state = nullptr;
reflowInput = nullptr;
}
if (state) {
WritingMode wm = state->GetWritingMode();
if (reflowInput) {
WritingMode wm = reflowInput->GetWritingMode();
NS_ASSERTION(wm == aFrame->GetWritingMode(), "unexpected writing mode");
aCBIStartEdge = state->ComputedLogicalBorderPadding().IStart(wm);
aCBSize = state->ComputedSize(wm);
aCBIStartEdge = reflowInput->ComputedLogicalBorderPadding().IStart(wm);
aCBSize = reflowInput->ComputedSize(wm);
} else {
/* Didn't find a reflow state for aFrame. Just compute the information we
/* Didn't find a reflow reflowInput for aFrame. Just compute the information we
want, on the assumption that aFrame already knows its size. This really
ought to be true by now. */
NS_ASSERTION(!(aFrame->GetStateBits() & NS_FRAME_IN_REFLOW),
@ -1266,14 +1268,14 @@ AreAllEarlierInFlowFramesEmpty(nsIFrame* aFrame,
// containing block. The writing-mode of the hypothetical box position will
// have the same block direction as the absolute containing block, but may
// differ in inline-bidi direction.
// In the code below, |cbrs->frame| is the absolute containing block, while
// In the code below, |aReflowInput->frame| is the absolute containing block, while
// |containingBlock| is the nearest block container of the placeholder frame,
// which may be different from the absolute containing block.
void
ReflowInput::CalculateHypotheticalPosition(
nsPresContext* aPresContext,
nsPlaceholderFrame* aPlaceholderFrame,
const ReflowInput* cbrs,
const ReflowInput* aReflowInput,
nsHypotheticalPosition& aHypotheticalPos,
LayoutFrameType aFrameType) const
{
@ -1285,7 +1287,7 @@ ReflowInput::CalculateHypotheticalPosition(
nscoord blockIStartContentEdge;
// Dummy writing mode for blockContentSize, will be changed as needed by
// GetHypotheticalBoxContainer.
WritingMode cbwm = cbrs->GetWritingMode();
WritingMode cbwm = aReflowInput->GetWritingMode();
LogicalSize blockContentSize(cbwm);
nsIFrame* containingBlock =
GetHypotheticalBoxContainer(aPlaceholderFrame, blockIStartContentEdge,
@ -1359,7 +1361,7 @@ ReflowInput::CalculateHypotheticalPosition(
// XXXbz the placeholder is not fully reflowed yet if our containing block is
// relatively positioned...
nsSize containerSize = containingBlock->GetStateBits() & NS_FRAME_IN_REFLOW
? cbrs->ComputedSizeAsContainerIfConstrained()
? aReflowInput->ComputedSizeAsContainerIfConstrained()
: containingBlock->GetSize();
LogicalPoint
placeholderOffset(wm, aPlaceholderFrame->GetOffsetTo(containingBlock),
@ -1480,7 +1482,7 @@ ReflowInput::CalculateHypotheticalPosition(
if (mStyleDisplay->mPosition == NS_STYLE_POSITION_FIXED &&
// Exclude cases inside -moz-transform where fixed is like absolute.
nsLayoutUtils::IsReallyFixedPos(mFrame)) {
// In this case, cbrs->frame will likely be an ancestor of
// In this case, aReflowInput->frame will likely be an ancestor of
// containingBlock, so can just walk our way up the frame tree.
// Make sure to not add positions of frames whose parent is a
// scrollFrame, since we're doing fixed positioning, which assumes
@ -1496,20 +1498,20 @@ ReflowInput::CalculateHypotheticalPosition(
// currently relative to the root frame (containingBlock) - so just
// subtract the offset to the absolute containing block to make it
// relative to that.
cbOffset -= containingBlock->GetOffsetTo(cbrs->mFrame);
cbOffset -= containingBlock->GetOffsetTo(aReflowInput->mFrame);
break;
}
containingBlock = parent;
} while (containingBlock != cbrs->mFrame);
} while (containingBlock != aReflowInput->mFrame);
} else {
// XXXldb We need to either ignore scrolling for the absolute
// positioning case too (and take the incompatibility) or figure out
// how to make these positioned elements actually *move* when we
// scroll, and thus avoid the resulting incremental reflow bugs.
cbOffset = containingBlock->GetOffsetTo(cbrs->mFrame);
cbOffset = containingBlock->GetOffsetTo(aReflowInput->mFrame);
}
nsSize cbrsSize = cbrs->ComputedSizeAsContainerIfConstrained();
LogicalPoint logCBOffs(wm, cbOffset, cbrsSize - containerSize);
nsSize reflowSize = aReflowInput->ComputedSizeAsContainerIfConstrained();
LogicalPoint logCBOffs(wm, cbOffset, reflowSize - containerSize);
aHypotheticalPos.mIStart += logCBOffs.I(wm);
aHypotheticalPos.mBStart += logCBOffs.B(wm);
@ -1517,8 +1519,9 @@ ReflowInput::CalculateHypotheticalPosition(
// padding edge and our current values are relative to the border edge, so
// translate.
LogicalMargin border =
cbrs->ComputedLogicalBorderPadding() - cbrs->ComputedLogicalPadding();
border = border.ConvertTo(wm, cbrs->GetWritingMode());
aReflowInput->ComputedLogicalBorderPadding() -
aReflowInput->ComputedLogicalPadding();
border = border.ConvertTo(wm, aReflowInput->GetWritingMode());
aHypotheticalPos.mIStart -= border.IStart(wm);
aHypotheticalPos.mBStart -= border.BStart(wm);
@ -1575,7 +1578,7 @@ ReflowInput::CalculateHypotheticalPosition(
LogicalPoint origin(wm, aHypotheticalPos.mIStart,
aHypotheticalPos.mBStart);
origin = origin.ConvertTo(cbwm, wm, cbrsSize -
origin = origin.ConvertTo(cbwm, wm, reflowSize -
boxSize.GetPhysicalSize(wm));
aHypotheticalPos.mIStart = origin.I(cbwm);
@ -1588,12 +1591,12 @@ ReflowInput::CalculateHypotheticalPosition(
void
ReflowInput::InitAbsoluteConstraints(nsPresContext* aPresContext,
const ReflowInput* cbrs,
const ReflowInput* aReflowInput,
const LogicalSize& aCBSize,
LayoutFrameType aFrameType)
{
WritingMode wm = GetWritingMode();
WritingMode cbwm = cbrs->GetWritingMode();
WritingMode cbwm = aReflowInput->GetWritingMode();
NS_PRECONDITION(aCBSize.BSize(cbwm) != NS_AUTOHEIGHT,
"containing block bsize must be constrained");
@ -1635,8 +1638,8 @@ ReflowInput::InitAbsoluteConstraints(nsPresContext* aPresContext,
hypotheticalPos.mIStart = nscoord(0);
hypotheticalPos.mBStart = nscoord(0);
} else {
CalculateHypotheticalPosition(aPresContext, placeholderFrame, cbrs,
hypotheticalPos, aFrameType);
CalculateHypotheticalPosition(aPresContext, placeholderFrame,
aReflowInput, hypotheticalPos, aFrameType);
}
}
@ -2064,8 +2067,8 @@ CalcQuirkContainingBlockHeight(const ReflowInput* aCBReflowInput)
}
// if we got to the html frame (a block child of the canvas) ...
else if (LayoutFrameType::Block == frameType && rs->mParentReflowInput &&
rs->mParentReflowInput->mFrame->IsCanvasFrame()) {
else if (LayoutFrameType::Block == frameType && ri->mParentReflowInput &&
ri->mParentReflowInput->mFrame->IsCanvasFrame()) {
// ... then subtract out margin/border/padding for the BODY element
result -= GetBlockMarginBorderPadding(secondAncestorRI);
}
@ -2231,14 +2234,14 @@ ReflowInput::InitConstraints(nsPresContext* aPresContext,
ComputedMaxWidth() = ComputedMaxHeight() = NS_UNCONSTRAINEDSIZE;
} else {
// Get the containing block reflow state
const ReflowInput* cbrs = mCBReflowInput;
MOZ_ASSERT(cbrs, "no containing block");
const ReflowInput* cbri = mCBReflowInput;
MOZ_ASSERT(cbri, "no containing block");
MOZ_ASSERT(mFrame->GetParent());
// If we weren't given a containing block width and height, then
// compute one
LogicalSize cbSize = (aContainingBlockSize == LogicalSize(wm, -1, -1))
? ComputeContainingBlockRectangle(aPresContext, cbrs)
? ComputeContainingBlockRectangle(aPresContext, cbri)
: aContainingBlockSize;
// See if the containing block height is based on the size of its
@ -2248,11 +2251,11 @@ ReflowInput::InitConstraints(nsPresContext* aPresContext,
// See if the containing block is a cell frame which needs
// to use the mComputedHeight of the cell instead of what the cell block passed in.
// XXX It seems like this could lead to bugs with min-height and friends
if (cbrs->mParentReflowInput) {
fType = cbrs->mFrame->Type();
if (cbri->mParentReflowInput) {
fType = cbri->mFrame->Type();
if (IS_TABLE_CELL(fType)) {
// use the cell's computed block size
cbSize.BSize(wm) = cbrs->ComputedSize(wm).BSize(wm);
cbSize.BSize(wm) = cbri->ComputedSize(wm).BSize(wm);
}
}
}
@ -2262,7 +2265,7 @@ ReflowInput::InitConstraints(nsPresContext* aPresContext,
// For calculating positioning offsets, margins, borders and
// padding, we use the writing mode of the containing block
WritingMode cbwm = cbrs->GetWritingMode();
WritingMode cbwm = cbri->GetWritingMode();
InitOffsets(cbwm, OffsetPercentBasis(mFrame, cbwm,
cbSize.ConvertTo(cbwm, wm)),
aFrameType, mFlags, aBorder, aPadding, mStyleDisplay);
@ -2284,12 +2287,12 @@ ReflowInput::InitConstraints(nsPresContext* aPresContext,
NS_FRAME_REPLACED_CONTAINS_BLOCK(
NS_CSS_FRAME_TYPE_INLINE) == mFrameType) {
// Get the containing block reflow state
NS_ASSERTION(nullptr != cbrs, "no containing block");
NS_ASSERTION(nullptr != cbri, "no containing block");
// in quirks mode, get the cb height using the special quirk method
if (!wm.IsVertical() &&
eCompatibility_NavQuirks == aPresContext->CompatibilityMode()) {
if (!IS_TABLE_CELL(fType)) {
cbSize.BSize(wm) = CalcQuirkContainingBlockHeight(cbrs);
cbSize.BSize(wm) = CalcQuirkContainingBlockHeight(cbri);
if (cbSize.BSize(wm) == NS_AUTOHEIGHT) {
blockSizeUnit = eStyleUnit_Auto;
}
@ -2303,7 +2306,7 @@ ReflowInput::InitConstraints(nsPresContext* aPresContext,
// as per CSS2 spec.
else
{
nscoord computedBSize = cbrs->ComputedSize(wm).BSize(wm);
nscoord computedBSize = cbri->ComputedSize(wm).BSize(wm);
if (NS_AUTOHEIGHT != computedBSize) {
cbSize.BSize(wm) = computedBSize;
}
@ -2400,7 +2403,9 @@ ReflowInput::InitConstraints(nsPresContext* aPresContext,
} else if (NS_FRAME_GET_TYPE(mFrameType) == NS_CSS_FRAME_TYPE_ABSOLUTE) {
// XXX not sure if this belongs here or somewhere else - cwk
InitAbsoluteConstraints(aPresContext, cbrs, cbSize.ConvertTo(cbrs->GetWritingMode(), wm), aFrameType);
InitAbsoluteConstraints(aPresContext, cbri,
cbSize.ConvertTo(cbri->GetWritingMode(), wm),
aFrameType);
} else {
AutoMaybeDisableFontInflation an(mFrame);
@ -2739,28 +2744,28 @@ ReflowInput::CalculateBlockSideMargins(LayoutFrameType aFrameType)
// 'direction' property of the parent to tell which margin to
// ignore
// First check if there is an HTML alignment that we should honor
const ReflowInput* prs = mParentReflowInput;
const ReflowInput* pri = mParentReflowInput;
if (aFrameType == LayoutFrameType::Table) {
NS_ASSERTION(prs->mFrame->IsTableWrapperFrame(),
NS_ASSERTION(pri->mFrame->IsTableWrapperFrame(),
"table not inside table wrapper");
// Center the table within the table wrapper based on the alignment
// of the table wrapper's parent.
prs = prs->mParentReflowInput;
pri = pri->mParentReflowInput;
}
if (prs &&
(prs->mStyleText->mTextAlign == NS_STYLE_TEXT_ALIGN_MOZ_LEFT ||
prs->mStyleText->mTextAlign == NS_STYLE_TEXT_ALIGN_MOZ_CENTER ||
prs->mStyleText->mTextAlign == NS_STYLE_TEXT_ALIGN_MOZ_RIGHT)) {
if (prs->mWritingMode.IsBidiLTR()) {
if (pri &&
(pri->mStyleText->mTextAlign == NS_STYLE_TEXT_ALIGN_MOZ_LEFT ||
pri->mStyleText->mTextAlign == NS_STYLE_TEXT_ALIGN_MOZ_CENTER ||
pri->mStyleText->mTextAlign == NS_STYLE_TEXT_ALIGN_MOZ_RIGHT)) {
if (pri->mWritingMode.IsBidiLTR()) {
isAutoStartMargin =
prs->mStyleText->mTextAlign != NS_STYLE_TEXT_ALIGN_MOZ_LEFT;
pri->mStyleText->mTextAlign != NS_STYLE_TEXT_ALIGN_MOZ_LEFT;
isAutoEndMargin =
prs->mStyleText->mTextAlign != NS_STYLE_TEXT_ALIGN_MOZ_RIGHT;
pri->mStyleText->mTextAlign != NS_STYLE_TEXT_ALIGN_MOZ_RIGHT;
} else {
isAutoStartMargin =
prs->mStyleText->mTextAlign != NS_STYLE_TEXT_ALIGN_MOZ_RIGHT;
pri->mStyleText->mTextAlign != NS_STYLE_TEXT_ALIGN_MOZ_RIGHT;
isAutoEndMargin =
prs->mStyleText->mTextAlign != NS_STYLE_TEXT_ALIGN_MOZ_LEFT;
pri->mStyleText->mTextAlign != NS_STYLE_TEXT_ALIGN_MOZ_LEFT;
}
}
// Otherwise apply the CSS rules, and ignore one margin by forcing

6
layout/generic/ReflowInput.h
View File

@ -992,15 +992,15 @@ protected:
// (for a position:fixed/absolute element) would have been placed if it were
// positioned statically. The hypothetical box position will have a writing
// mode with the same block direction as the absolute containing block
// (cbrs->frame), though it may differ in inline direction.
// (aReflowInput->frame), though it may differ in inline direction.
void CalculateHypotheticalPosition(nsPresContext* aPresContext,
nsPlaceholderFrame* aPlaceholderFrame,
const ReflowInput* cbrs,
const ReflowInput* aReflowInput,
nsHypotheticalPosition& aHypotheticalPos,
mozilla::LayoutFrameType aFrameType) const;
void InitAbsoluteConstraints(nsPresContext* aPresContext,
const ReflowInput* cbrs,
const ReflowInput* aReflowInput,
const mozilla::LogicalSize& aContainingBlockSize,
mozilla::LayoutFrameType aFrameType);

4
layout/generic/ReflowOutput.cpp
View File

@ -38,13 +38,13 @@ nsOverflowAreas::SetAllTo(const nsRect& aRect)
namespace mozilla {
ReflowOutput::ReflowOutput(const ReflowInput& aState,
ReflowOutput::ReflowOutput(const ReflowInput& aReflowInput,
uint32_t aFlags)
: mISize(0)
, mBSize(0)
, mBlockStartAscent(ASK_FOR_BASELINE)
, mFlags(aFlags)
, mWritingMode(aState.GetWritingMode())
, mWritingMode(aReflowInput.GetWritingMode())
{
}

8
layout/generic/nsBlockFrame.cpp
View File

@ -7221,7 +7221,7 @@ nsBlockFrame::ReflowBullet(nsIFrame* aBulletFrame,
ReflowOutput& aMetrics,
nscoord aLineTop)
{
const ReflowInput &rs = aState.mReflowInput;
const ReflowInput &ri = aState.mReflowInput;
// Reflow the bullet now
WritingMode bulletWM = aBulletFrame->GetWritingMode();
@ -7233,7 +7233,7 @@ nsBlockFrame::ReflowBullet(nsIFrame* aBulletFrame,
// Get the reason right.
// XXXwaterson Should this look just like the logic in
// nsBlockReflowContext::ReflowBlock and nsLineLayout::ReflowFrame?
ReflowInput reflowInput(aState.mPresContext, rs,
ReflowInput reflowInput(aState.mPresContext, ri,
aBulletFrame, availSize);
nsReflowStatus status;
aBulletFrame->Reflow(aState.mPresContext, aMetrics, reflowInput, status);
@ -7262,13 +7262,13 @@ nsBlockFrame::ReflowBullet(nsIFrame* aBulletFrame,
// IStart from floatAvailSpace gives us the content/float start edge
// in the current writing mode. Then we subtract out the start
// border/padding and the bullet's width and margin to offset the position.
WritingMode wm = rs.GetWritingMode();
WritingMode wm = ri.GetWritingMode();
// Get the bullet's margin, converted to our writing mode so that we can
// combine it with other logical values here.
LogicalMargin bulletMargin =
reflowInput.ComputedLogicalMargin().ConvertTo(wm, bulletWM);
nscoord iStart = floatAvailSpace.IStart(wm) -
rs.ComputedLogicalBorderPadding().IStart(wm) -
ri.ComputedLogicalBorderPadding().IStart(wm) -
bulletMargin.IEnd(wm) -
aMetrics.ISize(wm);

8
layout/generic/nsBlockReflowContext.cpp
View File

@ -28,11 +28,11 @@ using namespace mozilla;
#endif
nsBlockReflowContext::nsBlockReflowContext(nsPresContext* aPresContext,
const ReflowInput& aParentRS)
const ReflowInput& aParentRI)
: mPresContext(aPresContext),
mOuterReflowInput(aParentRS),
mSpace(aParentRS.GetWritingMode()),
mMetrics(aParentRS)
mOuterReflowInput(aParentRI),
mSpace(aParentRI.GetWritingMode()),
mMetrics(aParentRI)
{
}

2
layout/generic/nsBlockReflowContext.h
View File

@ -28,7 +28,7 @@ class nsBlockReflowContext {
public:
nsBlockReflowContext(nsPresContext* aPresContext,
const ReflowInput& aParentRS);
const ReflowInput& aParentRI);
~nsBlockReflowContext() { }
void ReflowBlock(const mozilla::LogicalRect& aSpace,

6
layout/generic/nsGfxScrollFrame.cpp
View File

@ -231,11 +231,11 @@ struct MOZ_STACK_CLASS ScrollReflowInput {
bool mShowVScrollbar;
ScrollReflowInput(nsIScrollableFrame* aFrame,
const ReflowInput& aState) :
mReflowInput(aState),
const ReflowInput& aReflowInput) :
mReflowInput(aReflowInput),
// mBoxState is just used for scrollbars so we don't need to
// worry about the reflow depth here
mBoxState(aState.mFrame->PresContext(), aState.mRenderingContext, 0),
mBoxState(aReflowInput.mFrame->PresContext(), aReflowInput.mRenderingContext, 0),
mStyles(aFrame->GetScrollbarStyles()) {
}
};

2
layout/generic/nsPageContentFrame.h
View File

@ -24,7 +24,7 @@ public:
// nsIFrame
virtual void Reflow(nsPresContext* aPresContext,
ReflowOutput& aDesiredSize,
const ReflowInput& aMaxSize,
const ReflowInput& aReflowInput,
nsReflowStatus& aStatus) override;
virtual bool IsFrameOfType(uint32_t aFlags) const override

2
layout/generic/nsPageFrame.h
View File

@ -24,7 +24,7 @@ public:
virtual void Reflow(nsPresContext* aPresContext,
ReflowOutput& aDesiredSize,
const ReflowInput& aMaxSize,
const ReflowInput& aReflowInput,
nsReflowStatus& aStatus) override;
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,

2
layout/generic/nsSimplePageSequenceFrame.h
View File

@ -65,7 +65,7 @@ public:
// nsIFrame
void Reflow(nsPresContext* aPresContext,
ReflowOutput& aDesiredSize,
const ReflowInput& aMaxSize,
const ReflowInput& aReflowInput,
nsReflowStatus& aStatus) override;
void BuildDisplayList(nsDisplayListBuilder* aBuilder,

8
layout/tables/nsTableFrame.cpp
View File

@ -4113,12 +4113,12 @@ nsTableFrame::IsAutoBSize(WritingMode aWM)
}
nscoord
nsTableFrame::CalcBorderBoxBSize(const ReflowInput& aState)
nsTableFrame::CalcBorderBoxBSize(const ReflowInput& aReflowInput)
{
nscoord bSize = aState.ComputedBSize();
nscoord bSize = aReflowInput.ComputedBSize();
if (NS_AUTOHEIGHT != bSize) {
WritingMode wm = aState.GetWritingMode();
LogicalMargin borderPadding = GetChildAreaOffset(wm, &aState);
WritingMode wm = aReflowInput.GetWritingMode();
LogicalMargin borderPadding = GetChildAreaOffset(wm, &aReflowInput);
bSize += borderPadding.BStartEnd(wm);
}
bSize = std::max(0, bSize);