Bug 1603088 Part 2 - Delete NS_FRAME_CONTAINS_RELATIVE_BSIZE manipulation in nsColumnSetFrame::Reflow(). r=dbaron
authorTing-Yu Lin <tlin@mozilla.com>
Wed, 08 Jan 2020 02:48:14 +0000
changeset 509291 fce0d0696080c4e6e52d5860b4f8875a3072d19c
parent 509290 969b70e2596026eb043064f93e86c1c899dc4dfd
child 509292 f7b4438f499f2598fee82412bf00a91cb0a02c4d
push id36993
push userdluca@mozilla.com
push dateWed, 08 Jan 2020 09:41:58 +0000
treeherdermozilla-central@12fb5e522dd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdbaron
bugs1603088
milestone74.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 1603088 Part 2 - Delete NS_FRAME_CONTAINS_RELATIVE_BSIZE manipulation in nsColumnSetFrame::Reflow(). r=dbaron Nowadays, ColumnSetFrame is an inner frame under ColumnSetWrapperFrame. It always has "block-size: auto", so `aReflowInput.ComputedBSize()` always equals to NS_UNCONSTRAINEDSIZE. Also, -moz-column-content no longer has "max-block-size: 100%", so NS_FRAME_CONTAINS_RELATIVE_BSIZE can never be set on ColumnSetFrame when constructing ReflowInputs for ColumnSetFrame's children in `ReflowInput::InitResizeFlags`. Removing the bit is not needed, either. Differential Revision: https://phabricator.services.mozilla.com/D58732
layout/generic/nsColumnSetFrame.cpp
--- a/layout/generic/nsColumnSetFrame.cpp
+++ b/layout/generic/nsColumnSetFrame.cpp
@@ -1194,23 +1194,16 @@ void nsColumnSetFrame::Reflow(nsPresCont
   MOZ_ASSERT(aStatus.IsEmpty(), "Caller should pass a fresh reflow status!");
 
   MOZ_ASSERT(aReflowInput.mCBReflowInput->mFrame->StyleColumn()
                  ->IsColumnContainerStyle(),
              "The column container should have relevant column styles!");
   MOZ_ASSERT(aReflowInput.mParentReflowInput->mFrame->IsColumnSetWrapperFrame(),
              "The column container should be ColumnSetWrapperFrame!");
 
-  // Our children depend on our block-size if we have a fixed block-size.
-  if (aReflowInput.ComputedBSize() != NS_UNCONSTRAINEDSIZE) {
-    AddStateBits(NS_FRAME_CONTAINS_RELATIVE_BSIZE);
-  } else {
-    RemoveStateBits(NS_FRAME_CONTAINS_RELATIVE_BSIZE);
-  }
-
 #ifdef DEBUG
   nsFrameList::Enumerator oc(GetChildList(kOverflowContainersList));
   for (; !oc.AtEnd(); oc.Next()) {
     MOZ_ASSERT(!IS_TRUE_OVERFLOW_CONTAINER(oc.get()));
   }
   nsFrameList::Enumerator eoc(GetChildList(kExcessOverflowContainersList));
   for (; !eoc.AtEnd(); eoc.Next()) {
     MOZ_ASSERT(!IS_TRUE_OVERFLOW_CONTAINER(eoc.get()));