[css-flexbox] Remove free-space-focused flex resolution algorithm, per WG resolution, in preparation for LC republication.

Author: fantasai

css-flexbox/Overview.bs

@@ -2585,133 +2585,6 @@ Cross-Axis Alignment</h3>
 <h3 id='resolve-flexible-lengths'>
 Resolving Flexible Lengths</h3>
 
-	Note: These two algorithms should give the same result.
-	We will delete the "LC" version in favor of the "CR" version
-	immediately before publishing our next LC.
-	For now we are maintaining both
-	to aid in finding any discrepancies in behavior between the two,
-	as those are bugs we'll need to fix.
-
-<h4 id="resolve-flexible-lengths-desired-free-space">
-Free Space Focused Algorithm (LC version)</h4>
-
-	<p>
-		To resolve the flexible lengths of the items within a flex line:
-
-	<ol>
-		<li>
-			<strong>Determine the used flex factor.</strong>
-			Sum the outer <i>hypothetical main sizes</i> of all items on the line.
-			If the sum is less than or equal to the flex container's inner main size,
-			use the <i>flex grow factor</i> for the rest of this algorithm;
-			otherwise, use the <i>flex shrink factor</i>.
-
-		<li>
-			<strong>Size inflexible items.</strong>
-			Freeze,
-			setting its <i>target main size</i>
-			to its <i>hypothetical main size</i>&hellip;
-			<ul>
-				<li>
-					any item that has a flex factor of zero
-
-				<li>
-					if using the <i>flex grow factor</i>:
-					any item that has a <a>flex base size</a> greater than its <a>hypothetical main size</a>
-
-				<li>
-					if using the <i>flex shrink factor</i>:
-					any item that has a <a>flex base size</a> smaller than its <a>hypothetical main size</a>
-			</ul>
-
-		<li>
-			<strong>Calculate initial <dfn>free space</dfn>.</strong>
-			Sum the outer sizes of all items on the line,
-			and subtract this from the flex container's inner main size.
-			For frozen items, use their outer <i>target main size</i>;
-			for other items, use their outer <a>flex base size</a>.
-
-		<li>
-			<strong>Calculate each unfrozen item’s <dfn>desired free space</dfn>.</strong>
-
-			If the initial <i>free space</i> is zero or positive,
-			each <i>flex item</i>’s <i>desired free space</i> is
-			the initial <i>free space</i> multiplied by the item’s <i>flex grow factor</i>.
-
-			If the initial <i>free space</i> is negative,
-			first find the <dfn>scaled flex factor sum</dfn>,
-			<code>max(1, &sum;unfrozen flex factors)</code>.
-			Then, for each unfrozen flex item,
-			find its <dfn>scaled flex factor</dfn> by multipling its <i>flex shrink factor</i> by its <a>flex base size</a>
-			and normalizing so that the sum of these <i>scaled flex factors</i> equals the <var>scaled flex factor sum</var>.
-			Then, multiply each item’s <i>flex shrink factor</i> by the initial <i>free space</i>,
-			and let the result be its <i>desired free space</i>.
-
-		<li>
-			<strong>Distribute <i>free space</i>.</strong>
-			<ol type=a>
-				<li>
-					<strong>Check for flexible items.</strong>
-					If all the <i>flex items</i> on the line are frozen,
-					free space has been distributed;
-					exit this step.
-
-				<li>
-					<strong>Calculate the remaining <i>free space</i></strong>
-					as for initial <i>free space</i>, above.
-
-				<li>
-					<strong>Find each unfrozen item’s <dfn>normalized free space</dfn>.</strong>
-					If the remaining <i>free space</i> is non-zero,
-					and its magnitude is less than that of the sum of the non-frozen <i>flex items</i>’ <i>desired free space</i>,
-					multiply each item’s <i>desired free space</i>
-					by the ratio (<var>remaining free space</var>/<var>initial free space</var>).
-					This is the item’s <i>normalized free space</i>.
-					Otherwise, use each item’s <i>desired free space</i> as its <i>normalized free space</i>.
-
-				<li>
-					<strong>Calculate each item’s <i>target main size</i>.</strong>
-					Set each non-frozen flex item's <i>target main size</i>
-					to the sum of its <a>flex base size</a> and its <var>normalized free space</var>.
-					Note: This may result in a negative main size temporarily.
-
-				<li>
-					<strong>Fix min/max violations.</strong>
-					Clamp each non-frozen item's <i>target main size</i> by its min and max main size properties.
-					If the item's main size was made smaller by this, it's a max violation.
-					If the item's main size was made larger by this, it's a min violation.
-
-				<li>
-					<strong>Freeze over-flexed items.</strong>
-					The total violation is the sum of the adjustments from the previous step,
-					<code>&sum;(<var>clamped size</var> - <var>unclamped size</var></code>).
-					If the total violation is:
-
-					<dl>
-						<dt>Zero
-						<dd>
-							Freeze all items.
-
-						<dt>Positive
-						<dd>
-							Freeze all the items with min violations to their clamped size.
-
-						<dt>Negative
-						<dd>
-							Freeze all the items with max violations to their clamped size.
-					</dl>
-				<li>
-					<strong>Loop:</strong>
-					Return to the first step, “Distribute free space.”
-			</ol>
-			<li>
-				<strong>Set each item’s used main size to its <i>target main size</i>.</strong>
-				Note: All items should be frozen at this point.
-	</ol>
-
-<h4 id="resolve-flexible-lengths-flex-factors">
-Flex Factor Focused Algorithm (CR version)</h4>
-
 	<p>
 		To resolve the flexible lengths of the items within a flex line:
 
@@ -2895,7 +2768,7 @@ Intrinsic Sizes</h3>
 			For each <a>flex item</a>,
 			subtract its <a>flex basis</a> from its <a>max-content contribution</a> size,
 			then divide by its <a>flex grow factor</a>, floored at 1,
-			or by its <a>scaled flex factor</a> (if the result was negative, flooring the <a>flex shrink factor</a> at 1 if necessary).
+			or by its <a>scaled flex shrink factor</a> (if the result was negative, flooring the <a>flex shrink factor</a> at 1 if necessary).
 			This is the item's <var>max-content flex fraction</var>.
 
 		<li>
@@ -2907,7 +2780,7 @@ Intrinsic Sizes</h3>
 			among all the <a>flex items</a>.
 			Add each item’s <a>flex basis</a>
 			to the product of its <a>flex grow factor</a>
-			(or <a>scaled flex factor</a>, if the chosen <var>max-content flex fraction</var> was negative)
+			(or <a>scaled flex shrink factor</a>, if the chosen <var>max-content flex fraction</var> was negative)
 			and the chosen <var>max-content flex fraction</var>,
 			then clamp that result by the <a>max main size property</a>.