[css-grid-1][css-grid-2] Revert changes for w3c#3648, see w3c#3648 (comment)

Author: tabatkins

css-grid-1/Overview.bs

@@ -4178,8 +4178,7 @@ Resolve Intrinsic Track Sizes</h3>
 				<li id="track-size-intrinsic-min">
 					<strong>For intrinsic minimums:</strong>
 					First [=distribute extra space=]
-					to <a>base sizes</a> of all tracks,
-					preferring those with
+					to <a>base sizes</a> of tracks with
 					an <a lt="intrinsic sizing function">intrinsic</a> <a>min track sizing function</a>,
 					to accommodate these items’ <a>minimum contributions</a>.
 
@@ -4198,8 +4197,7 @@ Resolve Intrinsic Track Sizes</h3>
 				<li id="track-size-content-min">
 					<strong>For content-based minimums:</strong>
 					Next continue to [=distribute extra space=]
-					to the [=base sizes=] of all tracks,
-					preferring those with
+					to the [=base sizes=] of tracks with
 					a <a>min track sizing function</a> of ''min-content'' or ''max-content'',
 					to accommodate these items' <a>min-content contributions</a>.
 
@@ -4208,16 +4206,14 @@ Resolve Intrinsic Track Sizes</h3>
 					Next, if the grid container is being sized
 					under a <a>max-content constraint</a>,
 					continue to [=distribute extra space=]
-					to the [=base sizes=] of all tracks,
-					preferring those with
+					to the [=base sizes=] of tracks with
 					a <a>min track sizing function</a> of
 					''grid-template-columns/auto'' or ''max-content'',
 					to accommodate these items' <a>limited max-content contributions</a>.
 
 					In all cases,
 					continue to [=distribute extra space=]
-					to the [=base sizes=] of all tracks,
-					preferring those with
+					to the [=base sizes=] of tracks with
 					a <a>min track sizing function</a> of ''max-content'',
 					to accommodate these items' <a>max-content contributions</a>.
 
@@ -4338,10 +4334,6 @@ Distributing Extra Space Across Spanned Tracks</h4>
 		* which tracks to affect (the |affected track|s).
 		* what intrinsic size contributions are being accommodated (the |size contribution|s)
 			of which grid items spanning those tracks (the |item|s).
-		* optionally, a preferred subset of the |affected tracks| (the |preferred track|s),
-			indicating a |track preference| (even if the subset is empty);
-			if no |track preference|,
-			the |preferred track|s default to all |affected track|s.
 
 		<ol>
 			<li>
@@ -4367,11 +4359,10 @@ Distributing Extra Space Across Spanned Tracks</h4>
 						<pre><var>space</var> = max(0, <var>size contribution</var> - ∑<var>track-sizes</var>)</pre>
 
 					<li>
-						<strong>Distribute |space| to |preferred track|s up to limits:</strong>
+						<strong>Distribute |space| up to limits:</strong>
 
-						If the item spans any |preferred track|s,
-						find the |item-incurred increase| for each such track by:
-						distributing the space equally among these tracks,
+						Find the |item-incurred increase| for each |affected track| by:
+						distributing the |space| equally among these tracks,
 						freezing a track’s |item-incurred increase|
 						as its |affected size| + |item-incurred increase|
 						reaches its |limit|
@@ -4383,45 +4374,29 @@ Distributing Extra Space Across Spanned Tracks</h4>
 						the |limit| is infinity if it is marked as [=infinitely growable=],
 						and equal to the [=growth limit=] otherwise.
 
-						Note: If the affected size was a <a>growth limit</a>
+						Note: If the |affected size| was a <a>growth limit</a>
 						and the track is not marked [=infinitely growable=],
 						then each |item-incurred increase| will be zero.
 
-					<li>
-						<strong>Distribute |space| to non-preferred tracks up to limits:</strong>
-
-						If extra |space| remains at this point
-						and the item spans any non-preferred |affected track|s,
-						then continue distributing |space| as defined in the previous step
-						to these |affected track|s,
-						skipping any tracks with a [=min-content=] [=max track sizing function=]
-						when accommodating [=max-content contributions=].
-
-						Note: This step only affects [=base sizes=],
-						because this algorithm is never invoked on [=growth limits=]
-						with any non-preferred |affected tracks|.
-
 					<li>
 						<strong>Distribute |space| beyond limits:</strong>
 
 						If extra |space| remains at this point,
-						unfreeze the |preferred track|s (if any)
-						or else the |affected track|s (if there was no |track preference|),
-						then continue to distribute |space| to the |item-incurred increase| of…
+						unfreeze and continue to distribute |space| to the |item-incurred increase| of…
 
 						<ul>
 							<li>
 								when <a href=#track-size-intrinsic-min>accommodating minimum contributions</a>
 								or <a href=#track-size-content-min>accommodating min-content contributions</a>:
-								any unfrozen |affected track| that happens to also have an intrinsic <a>max track sizing function</a>;
-								if there are no such tracks, then all unfrozen |affected track|s.
+								any |affected track| that happens to also have an intrinsic <a>max track sizing function</a>;
+								if there are no such tracks, then all |affected track|s.
 							<li>
 								when <a href=#track-size-max-content-min>accommodating max-content contributions</a>:
-								any unfrozen |affected track| that happens to also have a ''max-content'' <a>max track sizing function</a>;
-								if there are no such tracks, then all unfrozen |affected track|s.
+								any |affected track| that happens to also have a ''max-content'' <a>max track sizing function</a>;
+								if there are no such tracks, then all |affected track|s.
 							<li>
 								when handling any intrinsic <a>growth limit</a>:
-								all unfrozen |affected track|s.
+								all |affected track|s.
 						</ul>
 
 						For this purpose,

css-grid-2/Overview.bs

@@ -4865,8 +4865,7 @@ Resolve Intrinsic Track Sizes</h3>
 				<li id="track-size-intrinsic-min">
 					<strong>For intrinsic minimums:</strong>
 					First [=distribute extra space=]
-					to <a>base sizes</a> of all tracks,
-					preferring those with
+					to <a>base sizes</a> of tracks with
 					an <a lt="intrinsic sizing function">intrinsic</a> <a>min track sizing function</a>,
 					to accommodate these items’ <a>minimum contributions</a>.
 
@@ -4885,8 +4884,7 @@ Resolve Intrinsic Track Sizes</h3>
 				<li id="track-size-content-min">
 					<strong>For content-based minimums:</strong>
 					Next continue to [=distribute extra space=]
-					to the [=base sizes=] of all tracks,
-					preferring those with
+					to the [=base sizes=] of tracks with
 					a <a>min track sizing function</a> of ''min-content'' or ''max-content'',
 					to accommodate these items' <a>min-content contributions</a>.
 
@@ -4895,16 +4893,14 @@ Resolve Intrinsic Track Sizes</h3>
 					Next, if the grid container is being sized
 					under a <a>max-content constraint</a>,
 					continue to [=distribute extra space=]
-					to the [=base sizes=] of all tracks,
-					preferring those with
+					to the [=base sizes=] of tracks with
 					a <a>min track sizing function</a> of
 					''grid-template-columns/auto'' or ''max-content'',
 					to accommodate these items' <a>limited max-content contributions</a>.
 
 					In all cases,
 					continue to [=distribute extra space=]
-					to the [=base sizes=] of all tracks,
-					preferring those with
+					to the [=base sizes=] of tracks with
 					a <a>min track sizing function</a> of ''max-content'',
 					to accommodate these items' <a>max-content contributions</a>.
 
@@ -5025,10 +5021,6 @@ Distributing Extra Space Across Spanned Tracks</h4>
 		* which tracks to affect (the |affected track|s).
 		* what intrinsic size contributions are being accommodated (the |size contribution|s)
 			of which grid items spanning those tracks (the |item|s).
-		* optionally, a preferred subset of the |affected tracks| (the |preferred track|s),
-			indicating a |track preference| (even if the subset is empty);
-			if no |track preference|,
-			the |preferred track|s default to all |affected track|s.
 
 		<ol>
 			<li>
@@ -5054,11 +5046,10 @@ Distributing Extra Space Across Spanned Tracks</h4>
 						<pre><var>space</var> = max(0, <var>size contribution</var> - ∑<var>track-sizes</var>)</pre>
 
 					<li>
-						<strong>Distribute |space| to |preferred track|s up to limits:</strong>
+						<strong>Distribute |space| up to limits:</strong>
 
-						If the item spans any |preferred track|s,
-						find the |item-incurred increase| for each such track by:
-						distributing the space equally among these tracks,
+						Find the |item-incurred increase| for each |affected track| by:
+						distributing the |space| equally among these tracks,
 						freezing a track’s |item-incurred increase|
 						as its |affected size| + |item-incurred increase|
 						reaches its |limit|
@@ -5070,45 +5061,29 @@ Distributing Extra Space Across Spanned Tracks</h4>
 						the |limit| is infinity if it is marked as [=infinitely growable=],
 						and equal to the [=growth limit=] otherwise.
 
-						Note: If the affected size was a <a>growth limit</a>
+						Note: If the |affected size| was a <a>growth limit</a>
 						and the track is not marked [=infinitely growable=],
 						then each |item-incurred increase| will be zero.
 
-					<li>
-						<strong>Distribute |space| to non-preferred tracks up to limits:</strong>
-
-						If extra |space| remains at this point
-						and the item spans any non-preferred |affected track|s,
-						then continue distributing |space| as defined in the previous step
-						to these |affected track|s,
-						skipping any tracks with a [=min-content=] [=max track sizing function=]
-						when accommodating [=max-content contributions=].
-
-						Note: This step only affects [=base sizes=],
-						because this algorithm is never invoked on [=growth limits=]
-						with any non-preferred |affected track|s.
-
 					<li>
 						<strong>Distribute |space| beyond limits:</strong>
 
 						If extra |space| remains at this point,
-						unfreeze the |preferred track|s (if any)
-						or else the |affected track|s (if there was no |track preference|),
-						then continue to distribute |space| to the |item-incurred increase| of…
+						unfreeze and continue to distribute |space| to the |item-incurred increase| of…
 
 						<ul>
 							<li>
 								when <a href=#track-size-intrinsic-min>accommodating minimum contributions</a>
 								or <a href=#track-size-content-min>accommodating min-content contributions</a>:
-								any unfrozen |affected track| that happens to also have an intrinsic <a>max track sizing function</a>;
-								if there are no such tracks, then all unfrozen |affected track|s.
+								any |affected track| that happens to also have an intrinsic <a>max track sizing function</a>;
+								if there are no such tracks, then all |affected track|s.
 							<li>
 								when <a href=#track-size-max-content-min>accommodating max-content contributions</a>:
-								any unfrozen |affected track| that happens to also have a ''max-content'' <a>max track sizing function</a>;
-								if there are no such tracks, then all unfrozen |affected track|s.
+								any |affected track| that happens to also have a ''max-content'' <a>max track sizing function</a>;
+								if there are no such tracks, then all |affected track|s.
 							<li>
 								when handling any intrinsic <a>growth limit</a>:
-								all unfrozen |affected track|s.
+								all |affected track|s.
 						</ul>
 
 						For this purpose,