Clean up the initial 'figure out the hypo. main size' to just use the shrink-to-fit algorithm.

Author: tabatkins

css3-flexbox/Overview.html

@@ -29,11 +29,11 @@
 
    <h1 id=head-box-flexible>CSS Flexible Box Layout Module</h1>
 
-   <h2 class="no-num no-toc" id=w3c-working>Editor's Draft, 30 January 2012</h2>
+   <h2 class="no-num no-toc" id=w3c-working>Editor's Draft, 31 January 2012</h2>
 
    <dl>
     <dt>This version:
-     <!--<dd><a href="http://www.w3.org/TR/2012/ED-css3-flexbox-20120130/">http://www.w3.org/TR/2012/ED-css3-flexbox-20120130/</a>-->
+     <!--<dd><a href="http://www.w3.org/TR/2012/ED-css3-flexbox-20120131/">http://www.w3.org/TR/2012/ED-css3-flexbox-20120131/</a>-->
 
 
     <dd><a
@@ -1816,51 +1816,14 @@ <h2 id=layout-algorithm><span class=secno>7. </span> Flexbox Layout
     this algorithm deals with the items.
 
    <li>
-    <p>Resolve the width and height of every flexbox item into an absolute
-     length. If the width or height is already an absolute length (like
-     &lsquo;<code class=css>50px</code>&rsquo;) or was transformed into an
-     absolute length at computed-value time (like &lsquo;<code
-     class=css>10em</code>&rsquo;), skip the rest of this step for that
-     dimension.</p>
-
-    <p>Otherwise, determining the size requires a layout to transform it into
-     a pair of absolute lengths. For the purpose of this step:</p>
-
-    <ul>
-     <li>Treat <a href="#block-flexbox"><i>block flexboxes</i></a> as being
-      &lsquo;<code class=css>display:block</code>&rsquo; and <a
-      href="#inline-flexbox"><i>inline flexboxes</i></a> as being
-      &lsquo;<code class=css>display:inline-block</code>&rsquo;.
-
-     <li>Treat the flexbox and every flexbox item as establishing a block
-      formatting context.
-
-     <li>If the main size of a flexbox item is flexible, treat it as the
-      preferred size of the flexible length. <strong>Do not apply
-      min/max-width/height constraints to the preferred widths/heights of
-      flexible lengths - those constraints are handled elsewhere in this
-      algorithm, and doing so will produce incorrect results.</strong> Do
-      apply those constraints to non-flexible lengths, as normal.
-
-     <li>If the main size of a flexbox item is &lsquo;<code
-      class=property>auto</code>&rsquo;, or is being treated as &lsquo;<code
-      class=property>auto</code>&rsquo; due to the above step, treat it as
-      &lsquo;<code class=property>fit-content</code>&rsquo;. <span
-      class=note>IIRC, this is the name we expect to give to the "shrinkwrap"
-      behavior.</span>.
-    </ul>
-
-    <p>For each flexbox item:</p>
-
-    <ol>
-     <li>Ignore all other flexbox items (do layout as if the flexbox had only
-      a single child - the flexbox item in question). Using normal block
-      layout (and the preceding additional assumptions), resolve the width
-      and height of the flexbox item.
-    </ol>
-
-    <p>Each flexbox item now has a hypothetical width and hypothetical
-     height.</p>
+    <p>Layout the flexbox items using the shrink-to-fit algorithm. If the
+     main size of a flexbox item is flexible, treat it as the preferred size
+     of that flexible length. <strong>Do not apply min/max-width/height
+     constraints to the preferred size of flexible lengths - those
+     constraints are handled elsewhere in this algorithm, and doing so will
+     produce incorrect results.</strong></p>
+
+    <p>Each flexbox item now has a hypothetical main size.</p>
 
    <li>
     <p>If the flexbox is single-line, collect all the flexbox items into a

css3-flexbox/Overview.src.html

@@ -883,31 +883,13 @@ <h2 id='layout-algorithm'>
 
 	<ol>
 		<li value=0>Generate anonymous flexbox items around runs of continguous inline content in the flexbox, as described in the <a href="#flex-items">Flexbox Items</a> section.</li>
-		
+
 		<li>Re-order the flexbox items according to their 'flex-order'.  The items with the lowest (most negative) 'flex-order' values are first in the ordering.  If multiple items share a 'flex-order' value, they're ordered by document order.  This affects the order in which the flexbox items generate boxes in the box-tree, and how the rest of this algorithm deals with the items.</li>
 
 		<li>
-			<p>Resolve the width and height of every flexbox item into an absolute length.  If the width or height is already an absolute length (like ''50px'') or was transformed into an absolute length at computed-value time (like ''10em''), skip the rest of this step for that dimension.</p>
-
-			<p>Otherwise, determining the size requires a layout to transform it into a pair of absolute lengths.  For the purpose of this step:</p>
-			
-			<ul>
-				<li>Treat <i>block flexboxes</i> as being ''display:block'' and <i>inline flexboxes</i> as being ''display:inline-block''.</li>
-
-				<li>Treat the flexbox and every flexbox item as establishing a block formatting context.</li>
-
-				<li>If the main size of a flexbox item is flexible, treat it as the preferred size of the flexible length.  <strong>Do not apply min/max-width/height constraints to the preferred widths/heights of flexible lengths - those constraints are handled elsewhere in this algorithm, and doing so will produce incorrect results.</strong>  Do apply those constraints to non-flexible lengths, as normal.</li>
-
-				<li>If the main size of a flexbox item is 'auto', or is being treated as 'auto' due to the above step, treat it as 'fit-content'. <span class='note'>IIRC, this is the name we expect to give to the "shrinkwrap" behavior.</span>.</li>
-			</ul>
-
-			<p>For each flexbox item:</p>
-
-			<ol>
-				<li>Ignore all other flexbox items (do layout as if the flexbox had only a single child - the flexbox item in question).  Using normal block layout (and the preceding additional assumptions), resolve the width and height of the flexbox item.</li>
-			</ol>
+			<p>Layout the flexbox items using the shrink-to-fit algorithm.  If the main size of a flexbox item is flexible, treat it as the preferred size of that flexible length.  <strong>Do not apply min/max-width/height constraints to the preferred size of flexible lengths - those constraints are handled elsewhere in this algorithm, and doing so will produce incorrect results.</strong></p>
 
-			<p>Each flexbox item now has a hypothetical width and hypothetical height.</p>
+			<p>Each flexbox item now has a hypothetical main size.</p>
 		</li>
 
 		<li>