Bug 1661874 Part 4 - Simplify the condition to set colData.mHasExcessBSize to true. r=heycam
authorTing-Yu Lin <tlin@mozilla.com>
Mon, 31 Aug 2020 03:45:38 +0000
changeset 546972 cc4b6a85883f22bdffe86b5aa61e5be4f43f9c2c
parent 546971 84313d82b10a30871d3309e08c7a95957b6b2e81
child 546973 c1fa84508a52f140ca9cd52710c8f53391eaa996
push id125312
push useraethanyc@gmail.com
push dateMon, 31 Aug 2020 03:54:51 +0000
treeherderautoland@cc4b6a85883f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersheycam
bugs1661874
milestone82.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1661874 Part 4 - Simplify the condition to set colData.mHasExcessBSize to true. r=heycam nsColumnSetFrame's ComputedBSize() and ComputedMaxBSize() are always NS_UNCONSTRAINEDSIZE. Differential Revision: https://phabricator.services.mozilla.com/D88700
layout/generic/nsColumnSetFrame.cpp
--- a/layout/generic/nsColumnSetFrame.cpp
+++ b/layout/generic/nsColumnSetFrame.cpp
@@ -784,19 +784,17 @@ nsColumnSetFrame::ColumnBalanceData nsCo
         kidNextInFlow->AddStateBits(NS_FRAME_IS_OVERFLOW_CONTAINER);
       }
     } else if (kidNextInFlow->HasAnyStateBits(NS_FRAME_IS_OVERFLOW_CONTAINER)) {
       aStatus.SetNextInFlowNeedsReflow();
       reflowNext = true;
       kidNextInFlow->RemoveStateBits(NS_FRAME_IS_OVERFLOW_CONTAINER);
     }
 
-    if ((contentBEnd > aReflowInput.ComputedMaxBSize() ||
-         contentBEnd > aReflowInput.ComputedBSize() ||
-         contentBEnd > aReflowInput.mCBReflowInput->ComputedMaxBSize()) &&
+    if (contentBEnd > aReflowInput.mCBReflowInput->ComputedMaxBSize() &&
         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.
       colData.mHasExcessBSize = true;
     }
 
     // We have reached the maximum number of columns. If we are balancing, stop