Fix some inconsistencies in 'object-fit's definition, and reduce changes from LC, and reduce excessive indirection in the definition of its values. We want authors to have *some* chance of making sense of all this.

Author: fantasai

css3-images/Overview.html

@@ -2029,37 +2029,38 @@ <h3 id=object-fit><span class=secno>5.4. </span> Sizing Objects: the
   <p>The &lsquo;<a href="#object-fit0"><code
    class=property>object-fit</code></a>&rsquo; property specifies how the
    contents of a replaced element should be scaled relative to the box
-   established by its used height and width. It also enables scaling a
-   replaced element up to a specified maximum size or down to a specified
-   minimum size while preserving its aspect ratio.
-
-  <p>Not all replaced elements can be scaled, but images typically can.
-
-  <p>If the replaced element's content does not have an <a
-   href="#intrinsic-aspect-ratio"><i>intrinsic aspect ratio</i></a>, 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;.
+   established by its used height and width. Not all replaced elements can be
+   scaled, but images typically can.
 
   <dl>
    <dt>&lsquo;<code class=css>fill</code>&rsquo;
 
-   <dd>The object's <a href="#specified-size"><i>specified size</i></a> is
-    the element's used width and height.
+   <dd>The object's <a href="#concrete-object-size"><i>concrete object
+    size</i></a> is the element's used width and height.
 
    <dt>&lsquo;<code class=css>contain</code>&rsquo;
 
-   <dd>The object's <a href="#specified-size"><i>specified size</i></a> is a
-    "contain" constraint.
+   <dd>The object's <a href="#concrete-object-size"><i>concrete object
+    size</i></a> is the largest rectangle that has the object's <a
+    href="#intrinsic-aspect-ratio"><i>intrinsic aspect ratio</i></a>, and
+    additionally has neither width nor height larger than the replaced
+    element's used width and height, respectively.
 
    <dt>&lsquo;<code class=css>cover</code>&rsquo;
 
-   <dd>The object's <a href="#specified-size"><i>specified size</i></a> is a
-    "cover" constraint.
+   <dd>The object's <a href="#concrete-object-size"><i>concrete object
+    size</i></a> the smallest rectangle that has the object's <a
+    href="#intrinsic-aspect-ratio"><i>intrinsic aspect ratio</i></a>, and
+    additionally has neither width nor height smaller than the replaced
+    element's used width and height, respectively.
 
    <dt>&lsquo;<code class=css>none</code>&rsquo;
 
-   <dd>The object has no <a href="#specified-size"><i>specified size</i></a>.
+   <dd>Determine the object's <a href="#concrete-object-size"><i>concrete
+    object size</i></a> using the <a
+    href="#default-sizing-algorithm"><i>default sizing algorithm</i></a> with
+    no specified size, and a <a href="#default-object-size"><i>default object
+    size</i></a> equal to the replaced element's used width and height.
 
    <dt>&lsquo;<code class=css>scale-down</code>&rsquo;
 
@@ -2074,6 +2075,12 @@ <h3 id=object-fit><span class=secno>5.4. </span> Sizing Objects: the
      intrinsic aspect ratio, so the concept of "smaller" is well-defined.</p>
   </dl>
 
+  <p>If the replaced element's content does not have an <a
+   href="#intrinsic-aspect-ratio"><i>intrinsic aspect ratio</i></a>, the
+   &lsquo;<code class=css>cover</code>&rsquo; and &lsquo;<code
+   class=css>contain</code>&rsquo; values are treated as &lsquo;<code
+   class=css>fill</code>&rsquo;.
+
   <p>If the content does not completely fill the replaced element's content
    box, the unfilled space shows the replaced element's background. Since
    replaced elements always clip their contents to the content box, the

css3-images/Overview.src.html

@@ -1226,26 +1226,29 @@ <h3 id="object-fit">
 
 	<p>The 'object-fit' property specifies how the contents of a replaced element
 	should be scaled relative to the box established by its used height and width.
-	It also enables scaling a replaced element up to a specified maximum size
-	or down to a specified minimum size while preserving its aspect ratio.</p>
-
-	<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''.</p>
+	Not all replaced elements can be scaled, but images typically can.</p>
 
 	<dl>
 		<dt>''fill''</dt>
-		<dd>The object's <i>specified size</i> is the element's used width and height.</dd>
+		<dd>The object's <i>concrete object size</i> is the element's used width and height.</dd>
 
 		<dt>''contain''</dt>
-		<dd>The object's <i>specified size</i> is a "contain" constraint.</dd>
+		<dd>The object's <i>concrete object size</i> is the largest rectangle that
+		has the object's <i>intrinsic aspect ratio</i>, and additionally has neither
+		width nor height larger than the replaced element's used width and height,
+		respectively.</dd>
 
 		<dt>''cover''</dt>
-		<dd>The object's <i>specified size</i> is a "cover" constraint.</dd>
+		<dd>The object's <i>concrete object size</i> the smallest rectangle that
+		has the object's <i>intrinsic aspect ratio</i>, and additionally has neither
+		width nor height smaller than the replaced element's used width and height,
+		respectively.</dd>
 
 		<dt>''none''</dt>
-		<dd>The object has no <i>specified size</i>.</dd>
+		<dd>Determine the object's <i>concrete object size</i> using the
+		<i>default sizing algorithm</i> with no specified size, and a
+		<i>default object size</i> equal to the replaced element's used width and
+		height.</dd>
 
 		<dt>''scale-down''</dt>
 		<dd>
@@ -1257,6 +1260,9 @@ <h3 id="object-fit">
 		</dd>
 	</dl>
 
+	<p>If the replaced element's content does not have an <i>intrinsic aspect
+	ratio</i>, the ''cover'' and ''contain'' values are treated as ''fill''.</p>
+
 	<p>If the content does not completely fill the replaced element's content box,
 	the unfilled space shows the replaced element's background.
 	Since replaced elements always clip their contents to the content box, the