Split the 'replaced element' section into three pieces with specified and default object sizes set appropriately. Reword 'object-fit' to just specify the specified size.

--HG--
extra : rebase_source : c3be654da2da254eb13c9af57c4c6ca6ac2b3d8e

Author: tabatkins

css3-images/Overview.html

@@ -1975,15 +1975,32 @@ <h4 id=specified-and-default-sizes><span class=secno>5.1.1. </span>
     typical cursor on the UA's operating system. <a href="#CSS21"
     rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>
 
+   <dt>&lsquo;<code class=property>content</code>&rsquo; (non-replaced)
+
+   <dd>The <a href="#specified-size"><i>specified size</i></a> has no
+    constraints. The <a href="#default-object-size"><i>default object
+    size</i></a> is the largest rectangle that has a 2:1 width:height ratio,
+    is no larger than 300px width and 150px height, and has a width that fits
+    in the device. <a href="#CSS21"
+    rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>.
+
    <dt>replaced elements
 
+   <dd>Replaced elements are not sized by the <a
+    href="#default-sizing-algorithm"><i>default sizing algorithm</i></a>.
+    Instead, CSS 2.1 defines how to size them in sections <a
+    href="http://www.w3.org/TR/CSS2/visudet.html#min-max-widths">10.4</a> and
+    <a
+    href="http://www.w3.org/TR/CSS2/visudet.html#min-max-heights">10.7</a>.
+    <a href="#CSS21" rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>
+
+   <dt>contents of replaced elements
+
    <dd>The <a href="#specified-size"><i>specified size</i></a> is defined by
     &lsquo;<a href="#object-fit0"><code
     class=property>object-fit</code></a>&rsquo;. The <a
-    href="#default-object-size"><i>default object size</i></a> is the largest
-    rectangle that has a 2:1 width:height ratio, is no larger than 300px
-    width and 150px height, and has a width that fits in the device. <a
-    href="#CSS21" rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>.
+    href="#default-object-size"><i>default object size</i></a> is the used
+    width and height of the replaced element.
   </dl>
   <!-- ====================================================================== -->
 
@@ -2188,20 +2205,13 @@ <h3 id=object-fit><span class=secno>5.4. </span> Sizing Objects: the
   <p>If the replaced element's content does not have an <i>intrinsic aspect
    ratio</i>, all of the values for &lsquo;<a href="#object-fit0"><code
    class=property>object-fit</code></a>&rsquo; are treated as &lsquo;<code
-   class=css>fill</code>&rsquo;. Otherwise, the object is scaled as follows:
+   class=css>fill</code>&rsquo;.
 
   <dl>
    <dt>&lsquo;<code class=css>fill</code>&rsquo;
 
-   <dd>
-    <p>Set the object's size to the <a
-     href="#concrete-object-size"><i>concrete object size</i></a> obtained by
-     running the <a href="#default-sizing">object sizing algorithm</a> with a
-     <a href="#specified-size"><i>specified size</i></a> and a <a
-     href="#default-object-size"><i>default object size</i></a> equal to the
-     replaced element's used width and height.</p>
-
-    <p>This will allow the object to fill the replaced element's content box.</p>
+   <dd>The object's <a href="#specified-size"><i>specified size</i></a> is
+    the element's used width and height.
 
    <dt>&lsquo;<code class=css>contain</code>&rsquo;
 
@@ -2219,11 +2229,8 @@ <h3 id=object-fit><span class=secno>5.4. </span> Sizing Objects: the
      the contents. This will proportionally scale the used width and height
      up to the given maximum constraints.</p>
 
-    <p>Set the <a href="#concrete-object-size"><i>concrete object
-     size</i></a> to the largest width and height that has the same aspect
-     ratio as the object's intrinsic aspect ratio, and additionally has
-     neither width nor height larger than the replaced element's used width
-     and height, respectively.</p>
+    <p>The object's <a href="#specified-size"><i>specified size</i></a> is a
+     "contain" constraint.</p>
 
    <dt>&lsquo;<code class=css>cover</code>&rsquo;
 
@@ -2241,21 +2248,12 @@ <h3 id=object-fit><span class=secno>5.4. </span> Sizing Objects: the
      the contents. This will proportionally scale the used width and height
      down to the given minimum constraints.</p>
 
-    <p>Set the <a href="#concrete-object-size"><i>concrete object
-     size</i></a> to the smallest width and height that has the same aspect
-     ratio as the object's intrinsic aspect ratio, and additionally has
-     neither width nor height smaller than the replaced element's used width
-     and height, respectively.</p>
+    <p>The object's <a href="#specified-size"><i>specified size</i></a> is a
+     "cover" constraint.</p>
 
    <dt>&lsquo;<code class=css>none</code>&rsquo;
 
-   <dd>
-    <p>Set the content's size to the <a
-     href="#concrete-object-size"><i>concrete object size</i></a> obtained by
-     running the <a href="#default-sizing">object sizing algorithm</a> with
-     no <a href="#specified-size"><i>specified size</i></a>, and a <a
-     href="#default-object-size"><i>default object size</i></a> equal to the
-     replaced element's used width and height.</p>
+   <dd>The object has no <a href="#specified-size"><i>specified size</i></a>.
 
    <dt>&lsquo;<code class=css>scale-down</code>&rsquo;
 

css3-images/Overview.src.html

@@ -1123,8 +1123,14 @@ <h4 id='specified-and-default-sizes'>
 		<dt>'cursor'</dt>
 		<dd>The <i>specified size</i> has no constraints.  The <i>default object size</i> is a UA-defined size that should be based on the size of a typical cursor on the UA's operating system.  [[!CSS21]]</dd>
 
+		<dt>'content' (non-replaced)</dt>
+		<dd>The <i>specified size</i> has no constraints.  The <i>default object size</i> is the largest rectangle that has a 2:1 width:height ratio, is no larger than 300px width and 150px height, and has a width that fits in the device. [[!CSS21]].</dd>
+
 		<dt>replaced elements</dt>
-		<dd>The <i>specified size</i> is defined by 'object-fit'.  The <i>default object size</i> is the largest rectangle that has a 2:1 width:height ratio, is no larger than 300px width and 150px height, and has a width that fits in the device. [[!CSS21]].</dd>
+		<dd>Replaced elements are not sized by the <i>default sizing algorithm</i>.  Instead, CSS 2.1 defines how to size them in sections <a href="http://www.w3.org/TR/CSS2/visudet.html#min-max-widths">10.4</a> and <a href="http://www.w3.org/TR/CSS2/visudet.html#min-max-heights">10.7</a>. [[!CSS21]]</dd>
+
+		<dt>contents of replaced elements</dt>
+		<dd>The <i>specified size</i> is defined by 'object-fit'.  The <i>default object size</i> is the used width and height of the replaced element.</dd>
 	</dl>
 
 <!-- ====================================================================== -->
@@ -1242,20 +1248,11 @@ <h3 id="object-fit">
 	<p>Not all replaced elements can be scaled, but images typically can.</p>
 
 	<p>If the replaced element's content does not have an <i>intrinsic aspect
-	ratio</i>, all of the values for 'object-fit' are treated as ''fill''.
-	Otherwise, the object is scaled as follows:</p>
+	ratio</i>, all of the values for 'object-fit' are treated as ''fill''.</p>
 
 	<dl>
 		<dt>''fill''</dt>
-		<dd>
-			<p>Set the object's size to the <i>concrete object size</i> obtained
-			by running the <a href="#default-sizing">object sizing algorithm</a> with
-			a <i>specified size</i> and a <i>default object size</i> equal to the
-			replaced element's used width and height.</p>
-
-			<p>This will allow the object to fill the replaced element's
-			content box.</p>
-		</dd>
+		<dd>The object's <i>specified size</i> is the element's used width and height.</dd>
 
 		<dt>''contain''</dt>
 		<dd>
@@ -1267,10 +1264,7 @@ <h3 id="object-fit">
 			is the actual intrinsic ratio of the contents. This will proportionally
 			scale the used width and height up to the given maximum constraints.</p>
 
-			<p>Set the <i>concrete object size</i> to the largest width and height
-			that has the same aspect ratio as the object's intrinsic aspect ratio,
-			and additionally has neither width nor height larger than the replaced
-			element's used width and height, respectively.</p>
+			<p>The object's <i>specified size</i> is a "contain" constraint.</p>
 		</dd>
 
 		<dt>''cover''</dt>
@@ -1282,20 +1276,12 @@ <h3 id="object-fit">
 			dimensions of the contents were infinitely small numbers whose ratio 
 			is the actual intrinsic ratio of the contents. This will proportionally
 			scale the used width and height down to the given minimum constraints.</p>
-			
-			<p>Set the <i>concrete object size</i> to the smallest width and height
-			that has the same aspect ratio as the object's intrinsic aspect ratio, and
-			additionally has neither width nor height smaller than the replaced
-			element's used width and height, respectively.</p>
+
+			<p>The object's <i>specified size</i> is a "cover" constraint.</p>
 		</dd>
 
 		<dt>''none''</dt>
-		<dd>
-			<p>Set the content's size to the <i>concrete object size</i> obtained
-			by running the <a href='#default-sizing'>object sizing algorithm</a> with
-			no <i>specified size</i>, and a <i>default object size</i> equal to 
-			the replaced element's used width and height.</p>
-		</dd>
+		<dd>The object has no <i>specified size</i>.</dd>
 
 		<dt>''scale-down''</dt>
 		<dd>