diff --git a/layout/generic/crashtests/1816574.html b/layout/generic/crashtests/1816574.html new file mode 100644 index 000000000000..de5d440d90ae --- /dev/null +++ b/layout/generic/crashtests/1816574.html @@ -0,0 +1,39 @@ + + + + + + +

+ +
+ + +  e\r𠪢0i𝅯󠇩0*=𝤵*=\n‏�' lang='ar'> +
+
+
+
+ diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list index 7a69a3adfc78..f439341f955a 100644 --- a/layout/generic/crashtests/crashtests.list +++ b/layout/generic/crashtests/crashtests.list @@ -817,3 +817,4 @@ load 1776079.html asserts(0-2) load 1791606.html load 1799749.html pref(layout.css.content-visibility.enabled,true) asserts(1-4) load 1807958.html # asserts from integer overflow & bogus sizes +load 1816574.html diff --git a/layout/generic/nsColumnSetFrame.cpp b/layout/generic/nsColumnSetFrame.cpp index 922ecb117b61..4371494f6494 100644 --- a/layout/generic/nsColumnSetFrame.cpp +++ b/layout/generic/nsColumnSetFrame.cpp @@ -635,6 +635,11 @@ nsColumnSetFrame::ColumnBalanceData nsColumnSetFrame::ReflowColumns( aReflowInput.mParentReflowInput->mFrame->HasAnyStateBits( NS_FRAME_HAS_MULTI_COLUMN_ANCESTOR); if (isNestedMulticol) { + if (aConfig.mForceAuto) { + // If we are forced to fill columns sequentially, force fit the + // content whether we are at top of page or not. + return true; + } if (aReflowInput.mFlags.mIsTopOfPage) { // If this is the last balancing reflow in a nested multicol, we // want to force fit content to avoid infinite loops.