- From: Tab Atkins Jr.. via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 11 Nov 2011 03:17:14 +0000
- To: public-css-commits@w3.org
Update of /sources/public/csswg/css3-images
In directory hutz:/tmp/cvs-serv15451
Modified Files:
Overview.html Overview.src.html
Log Message:
Editorial edit to the sizing algorithm description.
Index: Overview.html
===================================================================
RCS file: /sources/public/csswg/css3-images/Overview.html,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -d -r1.206 -r1.207
--- Overview.html 11 Nov 2011 03:14:16 -0000 1.206
+++ Overview.html 11 Nov 2011 03:17:12 -0000 1.207
@@ -1588,11 +1588,12 @@
href="#intrinsic-dimensions"><i>intrinsic dimensions</i></a>.
<li>Using the <a href="#intrinsic-dimensions"><i>intrinsic
- dimensions</i></a> and the <a href="#specified-size"><i>specified
- size</i></a>, CSS then computes a <a
- href="#concrete-object-size"><i>concrete object size</i></a> that defines
- the size and position of the region the object will render in (specified
- in the following section).
+ dimensions</i></a>, the <a href="#specified-size"><i>specified
+ size</i></a>, and the <a href="#default-object-size"><i>default object
+ size</i></a> for the context the image or object is used in, CSS then
+ computes a <a href="#concrete-object-size"><i>concrete object
+ size</i></a> that defines the size and position of the region the object
+ will render in (specified in the following section).
<li>CSS asks the object to render itself at the <a
href="#concrete-object-size"><i>concrete object size</i></a>. CSS does
Index: Overview.src.html
===================================================================
RCS file: /sources/public/csswg/css3-images/Overview.src.html,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -d -r1.214 -r1.215
--- Overview.src.html 11 Nov 2011 03:14:16 -0000 1.214
+++ Overview.src.html 11 Nov 2011 03:17:12 -0000 1.215
@@ -996,24 +996,13 @@
<p>Objects in CSS are sized and rendered as follows:</p>
<ol>
- <li>When an image or object is specified in a document, such as through a url()
- value in a 'background-image' property or a @src attribute on an <img> element,
- CSS queries the object for its <i>intrinsic dimensions</i>.</li>
+ <li>When an image or object is specified in a document, such as through a url() value in a 'background-image' property or a @src attribute on an <img> element, CSS queries the object for its <i>intrinsic dimensions</i>.</li>
- <li>Using the <i>intrinsic dimensions</i> and the <i>specified size</i>,
- CSS then computes a <i>concrete object size</i> that defines the size and
- position of the region the object will render in (specified in the
- following section).</li>
+ <li>Using the <i>intrinsic dimensions</i>, the <i>specified size</i>, and the <i>default object size</i> for the context the image or object is used in, CSS then computes a <i>concrete object size</i> that defines the size and position of the region the object will render in (specified in the following section).</li>
- <li>CSS asks the object to render itself at the <i>concrete object size</i>.
- CSS does not define how objects render when the <i>concrete object size</i>
- is different from the object's <i>intrinsic dimensions</i>. The object may
- adjust itself to match the <i>concrete object size</i> in some way, or even
- render itself larger or smaller than the <i>concrete object size</i> to
- satisfy sizing constraints of its own.</li>
+ <li>CSS asks the object to render itself at the <i>concrete object size</i>. CSS does not define how objects render when the <i>concrete object size</i> is different from the object's <i>intrinsic dimensions</i>. The object may adjust itself to match the <i>concrete object size</i> in some way, or even render itself larger or smaller than the <i>concrete object size</i> to satisfy sizing constraints of its own.</li>
- <li>Unless otherwise specified by CSS, the object is then clipped to the
- <i>concrete object size</i>.</li>
+ <li>Unless otherwise specified by CSS, the object is then clipped to the <i>concrete object size</i>.</li>
</ol>
<!-- ====================================================================== -->
Received on Friday, 11 November 2011 03:17:21 UTC