hixie: clarify a parenthetical (whatwg r7104)

hixie: clarify a parenthetical (whatwg r7104)

http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.5658&r2=1.5659&f=h
http://html5.org/tools/web-apps-tracker?from=7103&to=7104

===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.5658
retrieving revision 1.5659
diff -u -d -r1.5658 -r1.5659
--- Overview.html 8 May 2012 21:27:06 -0000 1.5658
+++ Overview.html 15 May 2012 23:18:44 -0000 1.5659
@@ -321,7 +321,7 @@
 
    <h1>HTML5</h1>
    <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-   <h2 class="no-num no-toc" id="editor-s-draft-8-may-2012">Editor's Draft 8 May 2012</h2>
+   <h2 class="no-num no-toc" id="editor-s-draft-15-may-2012">Editor's Draft 15 May 2012</h2>
    <dl><dt>Latest Published Version:</dt>
     <dd><a href="http://www.w3.org/TR/html5/">http://www.w3.org/TR/html5/</a></dd>
     <dt>Latest Editor's Draft:</dt>
@@ -514,7 +514,7 @@
   Group</a> is the W3C working group responsible for this
   specification's progress along the W3C Recommendation
   track.
-  This specification is the 8 May 2012 Editor's Draft.
+  This specification is the 15 May 2012 Editor's Draft.
   </p>
 
 
@@ -4466,7 +4466,7 @@
 
    <li><p>Return <var title="">tokens</var>.</li>
 
-  </ol><p class="note">For the special cases of splitting a string <a href="#split-a-string-on-spaces" title="split a string on spaces">on spaces</a> and <a href="#split-a-string-on-spaces" title="split a string on spaces">on commas</a>, this algorithm
+  </ol><p class="note">For the special cases of splitting a string <a href="#split-a-string-on-spaces" title="split a string on spaces">on spaces</a> and <a href="#split-a-string-on-commas" title="split a string on commas">on commas</a>, this algorithm
   does not apply (those algorithms also perform <a href="#strip-leading-and-trailing-whitespace" title="strip
   leading and trailing whitespace">whitespace trimming</a>).</p>
 
@@ -22296,8 +22296,8 @@
 
   
 
-  <p>The image given by the <dfn id="attr-img-src" title="attr-img-src"><code>src</code></dfn> attribute is the
-  embedded content; the value of the <dfn id="attr-img-alt" title="attr-img-alt"><code>alt</code></dfn> attribute provides
+  <p>The image given by the <dfn id="attr-img-src" title="attr-img-src"><code>src</code></dfn>
+  attributes is the embedded content; the value of the <dfn id="attr-img-alt" title="attr-img-alt"><code>alt</code></dfn> attribute provides
   equivalent content for those who cannot process images or who have
   image loading disabled.</p>
 
@@ -22307,6 +22307,7 @@
   optionally animated, image resource that is neither paged nor
   scripted.</p>
 
+
   <p class="note">Images can thus be static bitmaps (e.g. PNGs, GIFs,
   JPEGs), single-page vector documents (single-page PDFs, XML files
   with an SVG root element), animated bitmaps (APNGs, animated GIFs),
@@ -22361,20 +22362,40 @@
 
   <p>A user agent that obtains images immediately must synchronously
   <a href="#update-the-image-data">update the image data</a> of an <code><a href="#the-img-element">img</a></code> element
-  whenever that element is either created with a <code title="attr-img-src"><a href="#attr-img-src">src</a></code> attribute, or has its <code title="attr-img-src"><a href="#attr-img-src">src</a></code> attribute set, changed, or removed,
-  or has its <code title="attr-img-crossorigin"><a href="#attr-img-crossorigin">crossorigin</a></code>
-  attribute set, changed, or removed.</p> 
+  whenever that element is created with a <code title="attr-img-src"><a href="#attr-img-src">src</a></code> attribute,
+  A user agent that obtains images immediately must also synchronously
+  <a href="#update-the-image-data">update the image data</a> of an <code><a href="#the-img-element">img</a></code> element
+  whenever that element has its
+  <code title="attr-img-src"><a href="#attr-img-src">src</a></code>,
+  <code title="attr-img-crossorigin"><a href="#attr-img-crossorigin">crossorigin</a></code> attribute set,
+  changed, or removed.</p> 
 
   <p>A user agent that obtains images on demand must <a href="#update-the-image-data">update the
   image data</a> of an <code><a href="#the-img-element">img</a></code> element whenever it needs
   the image data (i.e. on demand), but only if the <code><a href="#the-img-element">img</a></code>
-  element has a <code title="attr-img-src"><a href="#attr-img-src">src</a></code> attribute, and
-  only if the <code><a href="#the-img-element">img</a></code> element is in the <a href="#img-none" title="img-none">unavailable</a> state. When an <code><a href="#the-img-element">img</a></code>
-  element's <code title="attr-img-src"><a href="#attr-img-src">src</a></code> attribute is changed
-  or removed, and whenever the element's <code title="attr-img-crossorigin"><a href="#attr-img-crossorigin">crossorigin</a></code> attribute is set,
+  element has a
+  <code title="attr-img-src"><a href="#attr-img-src">src</a></code>
+  attribute, and only if the <code><a href="#the-img-element">img</a></code> element is in the <a href="#img-none" title="img-none">unavailable</a> state. When an <code><a href="#the-img-element">img</a></code>
+  element's
+  <code title="attr-img-src"><a href="#attr-img-src">src</a></code>,
+  <code title="attr-img-crossorigin"><a href="#attr-img-crossorigin">crossorigin</a></code> attribute set,
   changed, or removed, if the user agent only obtains images on
   demand, the <code><a href="#the-img-element">img</a></code> element must return to the <a href="#img-none" title="img-none">unavailable</a> state.</p> 
 
+  <p>Each <code><a href="#the-img-element">img</a></code> element has a <dfn id="last-selected-source">last selected
+  source</dfn>, which must initially be null, and a <dfn id="current-pixel-density">current pixel
+  density</dfn>, which must initially be undefined.</p>
+
+  <p>When an <code><a href="#the-img-element">img</a></code> element has a <a href="#current-pixel-density">current pixel
+  density</a> that is not 1.0, the element's image data must be
+  treated as if its resolution, in device pixels per CSS pixels, was
+  the <a href="#current-pixel-density">current pixel density</a>.</p>
+
+  <p class="example">For example, if the <a href="#current-pixel-density">current pixel
+  density</a> is 3.125, that means that there are 300 device pixels
+  per CSS inch, and thus if the image data is 300x600, it has an
+  intrinsic dimension of 96 CSS pixels by 192 CSS pixels.</p>
+
   <p>When the user agent is to <dfn id="update-the-image-data">update the image data</dfn> of an
   <code><a href="#the-img-element">img</a></code> element, it must run the following steps:</p>
 
@@ -22403,29 +22424,46 @@
 
     <p>&#8987; If another instance of this algorithm for this
     <code><a href="#the-img-element">img</a></code> element was started after this instance, then
-    abort these steps. Only the last instance takes effect, to avoid
-    multiple requests when the <code title="attr-img-src"><a href="#attr-img-src">src</a></code>
-    attribute is set multiple times in a row, or when the <code title="attr-img-src"><a href="#attr-img-src">src</a></code> and <code title="attr-img-crossorigin"><a href="#attr-img-crossorigin">crossorigin</a></code> attributes are
-    both set in succession.</p>
+    abort these steps.</p>
+
+    <p class="note">Only the last instance takes effect, to avoid
+    multiple requests when, for example, the
+    <code title="attr-img-src"><a href="#attr-img-src">src</a></code>,
+    <code title="attr-img-crossorigin"><a href="#attr-img-crossorigin">crossorigin</a></code> attributes
+    are all set in succession.</p>
 
    </li>
 
    <li>
 
-    <p>&#8987; If the element's <code title="attr-img-src"><a href="#attr-img-src">src</a></code>
-    attribute is missing or its value is the empty string, then set
-    the element to the <a href="#img-error" title="img-error">broken</a> state,
-    <a href="#queue-a-task">queue a task</a> to <a href="#fire-a-simple-event">fire a simple event</a>
-    named <code title="event-error">error</code> at the
+    <p>&#8987;
+
+
+    Otherwise, if the element has a <code title="attr-img-src"><a href="#attr-img-src">src</a></code> attribute specified and its value
+    is not the empty string, let <var title="">selected source</var>
+    be the value of the element's <code title="attr-img-src"><a href="#attr-img-src">src</a></code> attribute, and <var title="">selected pixel density</var> be 1.0. Otherwise, let <var title="">selected source</var> be null and <var title="">selected
+    pixel density</var> be undefined.</p>
+
+   </li>
+
+   <li><p>&#8987; Let the <code><a href="#the-img-element">img</a></code> element's <a href="#last-selected-source">last
+   selected source</a> be <var title="">selected source</var> and
+   the <code><a href="#the-img-element">img</a></code> element's <a href="#current-pixel-density">current pixel density</a>
+   be <var title="">selected pixel density</var>.</li>
+
+   <li>
+
+    <p>&#8987; If <var title="">selected source</var> is null, then
+    set the element to the <a href="#img-error" title="img-error">broken</a>
+    state, <a href="#queue-a-task">queue a task</a> to <a href="#fire-a-simple-event">fire a simple
+    event</a> named <code title="event-error">error</code> at the
     <code><a href="#the-img-element">img</a></code> element, and abort these steps.</p>
 
    </li>
 
    <li>
 
-    <p>&#8987; <a href="#resolve-a-url" title="resolve a url">Resolve</a> the value
-    of the element's <code title="attr-img-src"><a href="#attr-img-src">src</a></code> attribute,
-    relative to the element.</p>
+    <p>&#8987; <a href="#resolve-a-url" title="resolve a url">Resolve</a> <var title="">selected source</var>, relative to the element.</p>
 
     <p>If that is not successful, abort these steps.</p>
 
@@ -22545,11 +22583,7 @@
   <p>This specification does not specify which image types are to be
   supported.</p>
 
-  <p>The <a href="#task-source">task source</a> for the <a href="#concept-task" title="concept-task">tasks</a> <a href="#queue-a-task" title="queue a
-  task">queued</a> by algorithms in this section is the <a href="#dom-manipulation-task-source">DOM
-  manipulation task source</a>.</p>
-
-  <hr><p>What an <code><a href="#the-img-element">img</a></code> element represents depends on the <code title="attr-img-src"><a href="#attr-img-src">src</a></code> attribute and the <code title="attr-img-alt"><a href="#attr-img-alt">alt</a></code> attribute.</p>
+  <hr><hr><p>What an <code><a href="#the-img-element">img</a></code> element represents depends on the <code title="attr-img-src"><a href="#attr-img-src">src</a></code> attribute and the <code title="attr-img-alt"><a href="#attr-img-alt">alt</a></code> attribute.</p>
 
   <dl class="switch"><dt>If the <code title="attr-img-src"><a href="#attr-img-src">src</a></code> attribute is set
    and the <code title="attr-img-alt"><a href="#attr-img-alt">alt</a></code> attribute is set to
@@ -22694,9 +22728,9 @@
 
   <div class="impl">
 
-  <p>The <dfn id="dom-img-alt" title="dom-img-alt"><code>alt</code></dfn> and <dfn id="dom-img-src" title="dom-img-src"><code>src</code></dfn> IDL attributes must
-  <a href="#reflect">reflect</a> the respective content attributes of the same
-  name.</p>
+  <p>The <dfn id="dom-img-alt" title="dom-img-alt"><code>alt</code></dfn>, <dfn id="dom-img-src" title="dom-img-src"><code>src</code></dfn>,
+  IDL attributes must <a href="#reflect">reflect</a> the respective content
+  attributes of the same name.</p>
 
   <p>The <dfn id="dom-img-crossorigin" title="dom-img-crossOrigin"><code>crossOrigin</code></dfn> IDL
   attribute must <a href="#reflect">reflect</a> the <code title="attr-img-crossorigin"><a href="#attr-img-crossorigin">crossorigin</a></code> content
@@ -49623,9 +49657,9 @@
 <pre class="idl">interface <dfn id="htmldialogelement">HTMLDialogElement</dfn> : <a href="#htmlelement">HTMLElement</a> {
            attribute boolean <a href="#dom-dialog-open" title="dom-dialog-open">open</a>;
            attribute DOMString <a href="#dom-dialog-returnvalue" title="dom-dialog-returnValue">returnValue</a>;
-  void show(optional (<a href="#mouseevent">MouseEvent</a> or <a href="#element">Element</a>) anchor);
-  void showModal(optional (<a href="#mouseevent">MouseEvent</a> or <a href="#element">Element</a>) anchor);
-  void close(optional DOMString returnValue);
+  void <a href="#dom-dialog-show" title="dom-dialog-show">show</a>(optional (<a href="#mouseevent">MouseEvent</a> or <a href="#element">Element</a>) anchor);
+  void <a href="#dom-dialog-showmodal" title="dom-dialog-showModal">showModal</a>(optional (<a href="#mouseevent">MouseEvent</a> or <a href="#element">Element</a>) anchor);
+  void <a href="#dom-dialog-close" title="dom-dialog-close">close</a>(optional DOMString returnValue);
 };</pre>
    </dd>
   </dl><p>The <code><a href="#the-dialog-element">dialog</a></code> element represents a part of an
@@ -68778,7 +68812,9 @@
   the last consumed character (i.e. up to the character just before
   the U+003E or EOF character), but with any U+0000 NULL characters
   replaced by U+FFFD REPLACEMENT CHARACTER characters. (If the comment
-  was started by the end of the file (EOF), the token is empty.)</p>
+  was started by the end of the file (EOF), the token is empty.
+  Similarly, the token is empty if it was generated by the string
+  "<code title="">&lt;!&gt;</code>".)</p>
 
   <p>Switch to the <a href="#data-state">data state</a>.</p>

Received on Tuesday, 15 May 2012 23:19:19 UTC