mozilla-central: changeset 509291:fce0d0696080c4e6e52d5860b4f8875a3072d19c

author	Ting-Yu Lin <tlin@mozilla.com>
	Wed, 08 Jan 2020 02:48:14 +0000
changeset 509291	fce0d0696080c4e6e52d5860b4f8875a3072d19c
parent 509290	969b70e2596026eb043064f93e86c1c899dc4dfd
child 509292	f7b4438f499f2598fee82412bf00a91cb0a02c4d
push id	36993
push user	dluca@mozilla.com
push date	Wed, 08 Jan 2020 09:41:58 +0000
treeherder	mozilla-central@12fb5e522dd3 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	dbaron
bugs	1603088
milestone	74.0a1
first release with	nightly linux32 12fb5e522dd3 / 74.0a1 / 20200108094158 / files nightly linux64 12fb5e522dd3 / 74.0a1 / 20200108094158 / files nightly mac 12fb5e522dd3 / 74.0a1 / 20200108094158 / files nightly win32 12fb5e522dd3 / 74.0a1 / 20200108094158 / files nightly win64 12fb5e522dd3 / 74.0a1 / 20200108094158 / files
last release without	nightly linux32 e728bf01a2b6 / 74.0a1 / 20200107215758 / files nightly linux64 e728bf01a2b6 / 74.0a1 / 20200107215758 / files nightly mac e728bf01a2b6 / 74.0a1 / 20200107215758 / files nightly win32 e728bf01a2b6 / 74.0a1 / 20200107215758 / files nightly win64 e728bf01a2b6 / 74.0a1 / 20200107215758 / files

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

file | annotate | diff | comparison | revisions

--- 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()));