Bug 1603088 Part 2 - Delete NS_FRAME_CONTAINS_RELATIVE_BSIZE manipulation in nsColumnSetFrame::Reflow(). r=dbaron
☠☠ backed out by 5045bdc8b3d4 ☠ ☠
authorTing-Yu Lin <tlin@mozilla.com>
Tue, 07 Jan 2020 20:19:27 +0000
changeset 509184 2bd2d03f3c45dfbe63d553021749116f76e2b9d3
parent 509183 d4cc66fb7593c2ca68b4e2507e04ceae8e38cd9d
child 509185 e5623d655c052ae55397b05dc7e2d25db7dc3bb7
push id104503
push useraethanyc@gmail.com
push dateTue, 07 Jan 2020 20:20:17 +0000
treeherderautoland@2bd2d03f3c45 [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()));