зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1497990 Part 1 - Use mIsBalancing instead of comparison between mBalanceColCount with INT32_MAX. r=dbaron
Differential Revision: https://phabricator.services.mozilla.com/D8782 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
13567d6f63
Коммит
fe4ef80141
|
@ -765,7 +765,7 @@ nsColumnSetFrame::ReflowChildren(ReflowOutput& aDesiredSize,
|
|||
availSize, &kidCBSize);
|
||||
kidReflowInput.mFlags.mIsTopOfPage = true;
|
||||
kidReflowInput.mFlags.mTableIsSplittable = false;
|
||||
kidReflowInput.mFlags.mIsColumnBalancing = aConfig.mBalanceColCount < INT32_MAX;
|
||||
kidReflowInput.mFlags.mIsColumnBalancing = aConfig.mIsBalancing;
|
||||
|
||||
// We need to reflow any float placeholders, even if our column height
|
||||
// hasn't changed.
|
||||
|
@ -878,7 +878,7 @@ nsColumnSetFrame::ReflowChildren(ReflowOutput& aDesiredSize,
|
|||
|
||||
if ((contentBEnd > aReflowInput.ComputedMaxBSize() ||
|
||||
contentBEnd > aReflowInput.ComputedBSize()) &&
|
||||
aConfig.mBalanceColCount < INT32_MAX) {
|
||||
aConfig.mIsBalancing) {
|
||||
// We overflowed vertically, but have not exceeded the number of
|
||||
// columns. We're going to go into overflow columns now, so balancing
|
||||
// no longer applies.
|
||||
|
|
|
@ -120,7 +120,7 @@ protected:
|
|||
nscoord mColMaxBSize = NS_INTRINSICSIZE;
|
||||
|
||||
// A boolean controlling whether or not we are balancing. This should be
|
||||
// equivalent to mBalanceColCount == INT32_MAX.
|
||||
// equivalent to mBalanceColCount != INT32_MAX.
|
||||
bool mIsBalancing = false;
|
||||
|
||||
// The last known column block-size that was 'feasible'. A column bSize is
|
||||
|
|
Загрузка…
Ссылка в новой задаче