html5/spec Overview.html,1.2904,1.2905

Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv27109

Modified Files:
	Overview.html 
Log Message:
Make event summaries explicitly non-normative. (whatwg r3731)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.2904
retrieving revision 1.2905
diff -u -d -r1.2904 -r1.2905
--- Overview.html	2 Sep 2009 21:36:27 -0000	1.2904
+++ Overview.html	2 Sep 2009 22:13:26 -0000	1.2905
@@ -4633,8 +4633,11 @@
   specification for finding that <i>sniffed type</i>. <a href="#refsMIMESNIFF">[MIMESNIFF]</a></p>
 
   <p>The <dfn id="content-type-sniffing:-image" title="Content-Type sniffing: image">rules for sniffing
-  images specifically</dfn> are also defined in the Content-Type
-  Processing Model specification. <a href="#refsMIMESNIFF">[MIMESNIFF]</a></p>
+  images specifically</dfn> and the <dfn id="content-type-sniffing:-text-or-binary" title="Content-Type sniffing:
+  text or binary">rules for distingushing if a resource is text or
+  binary</dfn> are also defined in the Content-Type Processing Model
+  specification. Both sets of rules return a <a href="#mime-type">MIME type</a> as
+  their result. <a href="#refsMIMESNIFF">[MIMESNIFF]</a></p>
 
   <p class="warning">It is imperative that the rules in the
   Content-Type Processing Model specification be followed
@@ -17453,20 +17456,41 @@
 
        <li>
 
-        <p>If the resource has <a href="#content-type" title="Content-Type">associated
-        Content-Type metadata</a>, then let the <var title="">resource type</var> be the type specified in <a href="#content-type" title="Content-Type">the resource's Content-Type
-        metadata</a>.</p>
+        <p>If there is a <code title="attr-object-type"><a href="#attr-object-type">type</a></code>
+        attribute present on the <code><a href="#the-object-element">object</a></code> element, and that
+        attribute's value is a type that a <a href="#plugin">plugin</a>
+        supports, then let the <var title="">resource type</var> be
+        the type specified in that <code title="attr-object-type"><a href="#attr-object-type">type</a></code> attribute.</p>
+
+       </li>
+
+       <li>
+
+        <p>Otherwise, if the <var title="">resource type</var> is
+        unknown, and the resource has <a href="#content-type" title="Content-Type">associated Content-Type metadata</a>,
+        then let the <var title="">resource type</var> be the type
+        specified in <a href="#content-type" title="Content-Type">the resource's
+        Content-Type metadata</a>.</p>
+
+       </li>
+
+       <li>
+
+        <p>If the <var title="">resource type</var> is "<code title="">text/plain</code>", then let the <var title="">resource type</var> be the result of applying the
+        <a href="#content-type-sniffing:-text-or-binary" title="Content-Type sniffing: text or binary">rules for
+        distingushing if a resource is text or binary</a> to the
+        resource.</p>
 
        </li>
 
        <li>
 
         <p>If the <var title="">resource type</var> is unknown or
-        "<code title="">application/octet-stream</code>" and there is
-        a <code title="attr-object-type"><a href="#attr-object-type">type</a></code> attribute present
-        on the <code><a href="#the-object-element">object</a></code> element, then change the <var title="">resource type</var> to instead be the type specified
-        in that <code title="attr-object-type"><a href="#attr-object-type">type</a></code>
-        attribute.</p>
+        "<code title="">application/octet-stream</code>" at this point
+        and there is a <code title="attr-object-type"><a href="#attr-object-type">type</a></code>
+        attribute present on the <code><a href="#the-object-element">object</a></code> element, then
+        change the <var title="">resource type</var> to instead be the
+        type specified in that <code title="attr-object-type"><a href="#attr-object-type">type</a></code> attribute.</p>
 
         <p>Otherwise, if the <var title="">resource type</var> is
         "<code title="">application/octet-stream</code>" but there is
@@ -20440,7 +20464,7 @@
   <p>The timelines used by the objects returned by the <code title="dom-media-buffered"><a href="#dom-media-buffered">buffered</a></code>, <code title="dom-media-seekable"><a href="#dom-media-seekable">seekable</a></code> and <code title="dom-media-played"><a href="#dom-media-played">played</a></code> IDL attributes of <a href="#media-element" title="media element">media elements</a> must be the same as that
   element's <a href="#media-resource">media resource</a>'s timeline.</p>
 
-  </div><h5 id="mediaevents"><span class="secno">4.8.10.12 </span>Event summary</h5><p>The following events fire on <a href="#media-element" title="media element">media
+  </div><h5 id="mediaevents"><span class="secno">4.8.10.12 </span>Event summary</h5><p><i>This section is non-normative.</i><p>The following events fire on <a href="#media-element" title="media element">media
   elements</a> as part of the processing model described above:<table><thead><tr><th>Event name
      <th>Interface
      <th>Dispatched when...
@@ -21535,11 +21559,11 @@
 
     <p>If the first argument isn't an <code><a href="#the-img-element">img</a></code>,
     <code><a href="#the-canvas-element">canvas</a></code>, or <code><a href="#video">video</a></code> element, throws a
-    <code><a href="#type_mismatch_err">TYPE_MISMATCH_ERR</a></code> exception. If the image is not
-    fully decoded yet, or has no image data, throws an
-    <code><a href="#invalid_state_err">INVALID_STATE_ERR</a></code> exception. If the second argument
-    isn't one of the allowed values, throws a <code><a href="#syntax_err">SYNTAX_ERR</a></code>
-    exception.</p>
+    <code><a href="#type_mismatch_err">TYPE_MISMATCH_ERR</a></code> exception. If the image has no
+    image data, throws an <code><a href="#invalid_state_err">INVALID_STATE_ERR</a></code> exception. If
+    the second argument isn't one of the allowed values, throws a
+    <code><a href="#syntax_err">SYNTAX_ERR</a></code> exception. If the image isn't yet fully
+    decoded, then the method returns null.</p>
 
    </dd>
 
@@ -22825,11 +22849,11 @@
 
     <p>If the first argument isn't an <code><a href="#the-img-element">img</a></code>,
     <code><a href="#the-canvas-element">canvas</a></code>, or <code><a href="#video">video</a></code> element, throws a
-    <code><a href="#type_mismatch_err">TYPE_MISMATCH_ERR</a></code> exception. If the image is not
-    fully decoded yet, or has no image data, throws an
-    <code><a href="#invalid_state_err">INVALID_STATE_ERR</a></code> exception. If the second argument
-    isn't one of the allowed values, throws a <code><a href="#syntax_err">SYNTAX_ERR</a></code>
-    exception.</p>
+    <code><a href="#type_mismatch_err">TYPE_MISMATCH_ERR</a></code> exception. If the image has no
+    image data, throws an <code><a href="#invalid_state_err">INVALID_STATE_ERR</a></code> exception. If
+    the second argument isn't one of the allowed values, throws a
+    <code><a href="#syntax_err">SYNTAX_ERR</a></code> exception. If the image isn't yet fully
+    decoded, then nothing is drawn.</p>
 
    </dd>
 
@@ -45391,7 +45415,7 @@
   &lt;p&gt;The time is: &lt;output id="clock"&gt;&lt;/output&gt;&lt;/p&gt;
  &lt;/body&gt;
 &lt;/html&gt;</pre><p>Now, if the user goes to the page, the browser will cache the
-  files and make them available even when the user is offline.<h5 id="event-summary"><span class="secno">6.9.1.1 </span>Event summary</h5><p>When the user visits a page that declares a manifest, the browser
+  files and make them available even when the user is offline.<h5 id="event-summary"><span class="secno">6.9.1.1 </span>Event summary</h5><p><i>This section is non-normative.</i><p>When the user visits a page that declares a manifest, the browser
   will try to update the cache. It does this by fetching a copy of the
   manifest and, if the manifest has changed since the user agent last
   saw it, redownloading all the resources it mentions and caching them

Received on Wednesday, 2 September 2009 22:13:43 UTC