Skip to content

Commit 5d136e5

Browse files
committed
Address dbaron's request for clarification of the no-specified-size case.
<http://lists.w3.org/Archives/Public/www-style/2012Mar/0550.html>
1 parent 2c25d17 commit 5d136e5

2 files changed

Lines changed: 10 additions & 20 deletions

File tree

css3-images/Overview.html

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1813,24 +1813,12 @@ <h4 id=default-sizing><span class=secno>5.3.1. </span> Default Sizing
18131813
<li>If the <a href="#specified-size"><i>specified size</i></a> has no
18141814
constraints:
18151815
<ol>
1816-
<li>If the object has only an <a
1817-
href="#intrinsic-aspect-ratio"><i>intrinsic aspect ratio</i></a>, the
1818-
<a href="#concrete-object-size"><i>concrete object size</i></a> must
1819-
have that aspect ratio, and additionally be as large as possible
1820-
without either its height or width exceeding the height or width of the
1821-
<a href="#default-object-size"><i>default object size</i></a>.
1822-
Otherwise, the width and height of the <a
1823-
href="#concrete-object-size"><i>concrete object size</i></a> is the
1824-
same as the object's <a href="#intrinsic-width"><i>intrinsic
1825-
width</i></a> and <a href="#intrinsic-height"><i>intrinsic
1826-
height</i></a>, if they exist.
1827-
1828-
<li>If the <a href="#concrete-object-size"><i>concrete object
1829-
size</i></a> is still missing a width or height, and the object has an
1830-
<a href="#intrinsic-aspect-ratio"><i>intrinsic aspect ratio</i></a>,
1831-
the missing dimension is calculated from the present dimension and the
1832-
<a href="#intrinsic-aspect-ratio"><i>intrinsic aspect ratio</i></a>.
1833-
Otherwise, each missing dimension is taken from the <a
1816+
<li>If the object has an intrinsic height or width, its size is resolved
1817+
as if its <i>intrinsic size</i> were the <a
1818+
href="#specified-size"><i>specified size</i></a>.
1819+
1820+
<li>Otherwise, its size is resolved as a <a
1821+
href="#contain-constraint"><i>contain constraint</i></a> against the <a
18341822
href="#default-object-size"><i>default object size</i></a>.
18351823
</ol>
18361824
</ul>

css3-images/Overview.src.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,9 +1148,11 @@ <h4 id="default-sizing">
11481148
<li>If the <i>specified size</i> has no constraints:
11491149

11501150
<ol>
1151-
<li>If the object has only an <i>intrinsic aspect ratio</i>, the <i>concrete object size</i> must have that aspect ratio, and additionally be as large as possible without either its height or width exceeding the height or width of the <i>default object size</i>. Otherwise, the width and height of the <i>concrete object size</i> is the same as the object's <i>intrinsic width</i> and <i>intrinsic height</i>, if they exist.</li>
1151+
<li>If the object has an intrinsic height or width, its size is resolved
1152+
as if its <i>intrinsic size</i> were the <i>specified size</i>.
11521153

1153-
<li>If the <i>concrete object size</i> is still missing a width or height, and the object has an <i>intrinsic aspect ratio</i>, the missing dimension is calculated from the present dimension and the <i>intrinsic aspect ratio</i>. Otherwise, each missing dimension is taken from the <i>default object size</i>.</li>
1154+
<li>Otherwise, its size is resolved as a <i>contain constraint</i>
1155+
against the <i>default object size</i>.</li>
11541156
</ol>
11551157
</li>
11561158
</ul>

0 commit comments

Comments
 (0)