зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1271492 - Rename nsIFrame::eUseAutoHeight to eUseAutoBSize. r=dholbert
This commit is contained in:
Родитель
e643bbeaf5
Коммит
5dcee2e2c6
|
@ -4726,10 +4726,10 @@ nsFrame::ComputeSize(nsRenderingContext *aRenderingContext,
|
|||
result.ISize(aWM) = std::max(minISize, result.ISize(aWM));
|
||||
|
||||
// Compute block-axis size
|
||||
// (but not if we're auto-height or if we recieved the "eUseAutoHeight"
|
||||
// flag -- then, we'll just stick with the height that we already calculated
|
||||
// (but not if we have auto bsize or if we recieved the "eUseAutoBSize"
|
||||
// flag -- then, we'll just stick with the bsize that we already calculated
|
||||
// in the initial ComputeAutoSize() call.)
|
||||
if (!(aFlags & nsIFrame::eUseAutoHeight)) {
|
||||
if (!(aFlags & nsIFrame::eUseAutoBSize)) {
|
||||
if (!nsLayoutUtils::IsAutoBSize(*blockStyleCoord, aCBSize.BSize(aWM))) {
|
||||
result.BSize(aWM) =
|
||||
nsLayoutUtils::ComputeBSizeValue(aCBSize.BSize(aWM),
|
||||
|
|
|
@ -1624,7 +1624,7 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsPresContext* aPresContext,
|
|||
}
|
||||
if (mFlags.mUseAutoBSize) {
|
||||
computeSizeFlags =
|
||||
ComputeSizeFlags(computeSizeFlags | ComputeSizeFlags::eUseAutoHeight);
|
||||
ComputeSizeFlags(computeSizeFlags | ComputeSizeFlags::eUseAutoBSize);
|
||||
}
|
||||
if (wm.IsOrthogonalTo(cbwm)) {
|
||||
if (bStartIsAuto || bEndIsAuto) {
|
||||
|
@ -2329,7 +2329,7 @@ nsHTMLReflowState::InitConstraints(nsPresContext* aPresContext,
|
|||
}
|
||||
if (mFlags.mUseAutoBSize) {
|
||||
computeSizeFlags =
|
||||
ComputeSizeFlags(computeSizeFlags | ComputeSizeFlags::eUseAutoHeight);
|
||||
ComputeSizeFlags(computeSizeFlags | ComputeSizeFlags::eUseAutoBSize);
|
||||
}
|
||||
|
||||
nsIFrame* parent = frame->GetParent();
|
||||
|
@ -2370,7 +2370,7 @@ nsHTMLReflowState::InitConstraints(nsPresContext* aPresContext,
|
|||
// auto height, pass that information along to ComputeSize().
|
||||
if (mFlags.mIsFlexContainerMeasuringHeight) {
|
||||
computeSizeFlags =
|
||||
ComputeSizeFlags(computeSizeFlags | ComputeSizeFlags::eUseAutoHeight);
|
||||
ComputeSizeFlags(computeSizeFlags | ComputeSizeFlags::eUseAutoBSize);
|
||||
}
|
||||
} else {
|
||||
MOZ_ASSERT(!mFlags.mIsFlexContainerMeasuringHeight,
|
||||
|
|
|
@ -682,7 +682,7 @@ public:
|
|||
// will be passed to ComputeSize()).
|
||||
COMPUTE_SIZE_SHRINK_WRAP = (1<<2),
|
||||
|
||||
// The caller wants height:auto behavior (ComputeSizeFlags::eUseAutoHeight
|
||||
// The caller wants 'auto' bsize behavior (ComputeSizeFlags::eUseAutoBSize
|
||||
// will be be passed to ComputeSize()).
|
||||
COMPUTE_SIZE_USE_AUTO_BSIZE = (1<<3),
|
||||
|
||||
|
|
|
@ -1896,10 +1896,10 @@ public:
|
|||
* shrink-wrap (e.g., it's floating, absolutely positioned, or
|
||||
* inline-block). */
|
||||
eShrinkWrap = 1 << 0,
|
||||
/* Set if we'd like to compute our 'auto' height, regardless of our actual
|
||||
* computed value of 'height'. (e.g. to get an intrinsic height for flex
|
||||
/* Set if we'd like to compute our 'auto' bsize, regardless of our actual
|
||||
* corresponding computed value. (e.g. to get an intrinsic height for flex
|
||||
* items with "min-height: auto" to use during flexbox layout.) */
|
||||
eUseAutoHeight = 1 << 1
|
||||
eUseAutoBSize = 1 << 1
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
Загрузка…
Ссылка в новой задаче