Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1267462 part 8: Rename ReflowInput.mFlags.mIsFlexContainerMeasuringHeight with s/Height/BSize/, to match reality. r=mats

Browse Source 
This patch doesn't change behavior; it's simply a rename.

I'm also fixing one mistyped mention of this variable in a comment in
nsFlexContainerFrame.cpp.  (The comment had "Reflow" rather than "Height" in
its mention of this variable-name.)

MozReview-Commit-ID: KRW7FCVSlto

--HG--
extra : rebase_source : 2a27ea3bf9d3eabc437db398d24e374ce48ba677
This commit is contained in:
Daniel Holbert 2018-02-08 15:15:11 -08:00
parent fa61229977
commit a5c3b4fd13
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
layout/generic/ReflowInput.cpp
View File

@ -221,7 +221,7 @@ ReflowInput::ReflowInput(
CheckNextInFlowParenthood(aFrame, aParentReflowInput.mFrame);
mFlags.mAssumingHScrollbar = mFlags.mAssumingVScrollbar = false;
mFlags.mIsColumnBalancing = false;
mFlags.mIsFlexContainerMeasuringHeight = false;
mFlags.mIsFlexContainerMeasuringBSize = false;
mFlags.mDummyParentReflowInput = false;
mFlags.mShrinkWrap = !!(aFlags & COMPUTE_SIZE_SHRINK_WRAP);
mFlags.mUseAutoBSize = !!(aFlags & COMPUTE_SIZE_USE_AUTO_BSIZE);
@ -2482,15 +2482,15 @@ ReflowInput::InitConstraints(nsPresContext* aPresContext,
ComputeSizeFlags(computeSizeFlags | ComputeSizeFlags::eShrinkWrap);
// If we're inside of a flex container that needs to measure our
// auto height, pass that information along to ComputeSize().
if (mFlags.mIsFlexContainerMeasuringHeight) {
// auto BSize, pass that information along to ComputeSize().
if (mFlags.mIsFlexContainerMeasuringBSize) {
computeSizeFlags =
ComputeSizeFlags(computeSizeFlags | ComputeSizeFlags::eUseAutoBSize);
}
} else {
MOZ_ASSERT(!mFlags.mIsFlexContainerMeasuringHeight,
MOZ_ASSERT(!mFlags.mIsFlexContainerMeasuringBSize,
"We're not in a flex container, so the flag "
"'mIsFlexContainerMeasuringHeight' shouldn't be set");
"'mIsFlexContainerMeasuringBSize' shouldn't be set");
}
}
@ -3057,7 +3057,7 @@ ReflowInput::ComputeMinMaxValues(const LogicalSize&aCBSize)
minBSize.HasPercent()) ||
(mFrameType == NS_CSS_FRAME_TYPE_INTERNAL_TABLE &&
minBSize.IsCalcUnit() && minBSize.CalcHasPercent()) ||
mFlags.mIsFlexContainerMeasuringHeight) {
mFlags.mIsFlexContainerMeasuringBSize) {
ComputedMinBSize() = 0;
} else {
ComputedMinBSize() = ComputeBSizeValue(aCBSize.BSize(wm),
@ -3079,7 +3079,7 @@ ReflowInput::ComputeMinMaxValues(const LogicalSize&aCBSize)
maxBSize.HasPercent()) ||
(mFrameType == NS_CSS_FRAME_TYPE_INTERNAL_TABLE &&
maxBSize.IsCalcUnit() && maxBSize.CalcHasPercent()) ||
mFlags.mIsFlexContainerMeasuringHeight) {
mFlags.mIsFlexContainerMeasuringBSize) {
ComputedMaxBSize() = NS_UNCONSTRAINEDSIZE;
} else {
ComputedMaxBSize() = ComputeBSizeValue(aCBSize.BSize(wm),

6
layout/generic/ReflowInput.h
View File

@ -205,9 +205,9 @@ public:
bool mHeightDependsOnAncestorCell : 1; // Does frame height depend on
// an ancestor table-cell?
bool mIsColumnBalancing : 1; // nsColumnSetFrame is balancing columns
bool mIsFlexContainerMeasuringHeight : 1; // nsFlexContainerFrame is
// reflowing this child to
// measure its intrinsic height.
bool mIsFlexContainerMeasuringBSize : 1; // nsFlexContainerFrame is
// reflowing this child to
// measure its intrinsic BSize.
bool mDummyParentReflowInput : 1; // a "fake" reflow state made
// in order to be the parent
// of a real one

5
layout/generic/nsFlexContainerFrame.cpp
View File

@ -1660,7 +1660,7 @@ nsFlexContainerFrame::
* intrinsic size is marked as dirty (due to a style or DOM change).
*
* In particular the computed height may change between measuring reflows due to
* how the mIsFlexContainerMeasuringReflow flag affects size computation (see
* how the mIsFlexContainerMeasuringBSize flag affects size computation (see
* bug 1336708).
*
* Caching it prevents us from doing exponential reflows in cases of deeply
@ -1765,8 +1765,7 @@ nsFlexContainerFrame::
childRIForMeasuringBSize(aPresContext, aParentReflowInput,
aFlexItem.Frame(), availSize,
nullptr, ReflowInput::CALLER_WILL_INIT);
// XXXdholbert NOTE: Next patch will do s/Height/BSize/ on this flag:
childRIForMeasuringBSize.mFlags.mIsFlexContainerMeasuringHeight = true;
childRIForMeasuringBSize.mFlags.mIsFlexContainerMeasuringBSize = true;
childRIForMeasuringBSize.Init(aPresContext);
if (aFlexItem.IsStretched()) {