Properly treat 'auto' as min/max-content when under constraints, and use min-size contribution more consistently.

Author: tabatkins

css-grid/Overview.bs

@@ -3607,7 +3607,7 @@ Resolve Intrinsic Track Sizes</h3>
 
 					Otherwise,
 					set its <a>base size</a>
-					to the maximum of its items’ “min-size contributions”:
+					to the maximum of its items’ <dfn noexport>min-size contributions</dfn>:
 					the value specified by its respective 'min-width' or 'min-height' properties
 					(whichever matches the relevant axis)
 					if the specified size is ''width/auto'',
@@ -3645,18 +3645,21 @@ Resolve Intrinsic Track Sizes</h3>
 					First increase the <a>base size</a> of tracks with
 					a <a>min track sizing function</a> of ''min-content'', ''max-content'', or ''auto''
 					by <a href="#extra-space">distributing extra space</a> as needed
-					to accommodate the contributions dictated by these items’
-					minimum size (as specified by 'min-width'/'min-height').
+					to accommodate the contributions dictated by these items’ <a>min-size contributions</a>.
 				<li>
 					<strong>For content-based minimums:</strong>
 					Next continue to increase the <a>base size</a> of tracks with
-					a <a>min track sizing function</a> of ''min-content'' or ''max-content''
+					a <a>min track sizing function</a> of ''min-content'' or ''max-content'',
+					and tracks with a <a>min track sizing function</a> of ''auto''
+					if the <a>grid container</a> is being sized under a <a>min-content constraint</a>,
 					by <a href="#extra-space">distributing extra space</a> as needed
 					to account for these items' <a>min-content contributions</a>.
 				<li>
 					<strong>For max-content minimums:</strong>
 					Third continue to increase the <a>base size</a> of tracks with
-					a <a>min track sizing function</a> of ''max-content''
+					a <a>min track sizing function</a> of ''max-content'',
+					and tracks with a <a>min track sizing function</a> of ''auto''
+					if the <a>grid container</a> is being sized under a <a>max-content constraint</a>,
 					by <a href="#extra-space">distributing extra space</a> as needed
 					to account for these items' <a>max-content contributions</a>.
 				<li>
@@ -3667,7 +3670,7 @@ Resolve Intrinsic Track Sizes</h3>
 					Next increase the <a>growth limit</a> of tracks with
 					a <a>max track sizing function</a> of ''min-content'' or ''max-content'' (including ''auto'')
 					by <a href="#extra-space">distributing extra space</a> as needed
-					to account for these items' <a>min-content contributions</a>.
+					to account for these items' <a>min-size contributions</a>.
 					Mark any tracks whose <a>growth limit</a> changed
 					from infinite to finite in this step
 					as <dfn>infinitely growable</dfn> for the next step.