[html5] r1785 - /

[whatwg at whatwg.org]

Author: ianh
Date: 2008-06-17 21:30:16 -0700 (Tue, 17 Jun 2008)
New Revision: 1785

Modified:
   index
   source
Log:
[giow] (2) Allow sniffing when the expected type is an image. (continuation of changes for previous checkin)

Modified: index
===================================================================
--- index	2008-06-18 04:26:03 UTC (rev 1784)
+++ index	2008-06-18 04:30:16 UTC (rev 1785)
@@ -7709,18 +7709,19 @@
    whether to <em>apply</em> the resource, not the aforementioned assumed
    type.
 
-  <p>If the resource is expected to be an image, user agents may apply the <a
-   href="#content-type6" title="Content-Type sniffing: image">image sniffing
-   rules</a>, with the <var title="">official type</var> being the type
-   determined from the resource's <a href="#content-type8"
-   title=Content-Type>Content-Type metadata</a>, and use the resulting
-   sniffed type of the resource as if it was the actual type. Otherwise, if
-   the resource is not expected to be an image, or if the user agent opts not
-   to apply those rules, then the user agent must use the resource's <a
-   href="#content-type8" title=Content-Type>Content-Type metadata</a> to
-   determine the type of the resource. If there is no type metadata, but the
-   external resource link type has a default type defined, then the user
-   agent must assume that the resource is of that type.
+  <p id=concept-link-type-sniffing>If the resource is expected to be an
+   image, user agents may apply the <a href="#content-type6"
+   title="Content-Type sniffing: image">image sniffing rules</a>, with the
+   <var title="">official type</var> being the type determined from the
+   resource's <a href="#content-type8" title=Content-Type>Content-Type
+   metadata</a>, and use the resulting sniffed type of the resource as if it
+   was the actual type. Otherwise, if the resource is not expected to be an
+   image, or if the user agent opts not to apply those rules, then the user
+   agent must use the resource's <a href="#content-type8"
+   title=Content-Type>Content-Type metadata</a> to determine the type of the
+   resource. If there is no type metadata, but the external resource link
+   type has a default type defined, then the user agent must assume that the
+   resource is of that type.
 
   <p>Once the user agent has established the type of the resource, the user
    agent must apply the resource if it is of a supported type and the other
@@ -36425,9 +36426,9 @@
    attributes.
 
   <p>There is no default type for resources given by the <code
-   title=rel-icon><a href="#icon3">icon</a></code> keyword.</p>
-  <!-- XXX we don't define
-  the content-type sniffing for this keyword -->
+   title=rel-icon><a href="#icon3">icon</a></code> keyword. However, for the
+   purposes of <a href="#concept-link-type-sniffing">determining the type of
+   the resource</a>, user agents must expect the resource to be an image.
 
   <p>The <dfn id=sizes0 title=attr-link-sizes><code>sizes</code></dfn>
    attribute gives the sizes of icons for visual media.

Modified: source
===================================================================
--- source	2008-06-18 04:26:03 UTC (rev 1784)
+++ source	2008-06-18 04:30:16 UTC (rev 1785)
@@ -6084,19 +6084,19 @@
   used to determine whether to <em>apply</em> the resource, not the
   aforementioned assumed type.</p>
 
-  <p>If the resource is expected to be an image, user agents may apply
-  the <span title="Content-Type sniffing: image">image sniffing
-  rules</span>, with the <var title="">official type</var> being the
-  type determined from the resource's <span
-  title="Content-Type">Content-Type metadata</span>, and use the
-  resulting sniffed type of the resource as if it was the actual
-  type. Otherwise, if the resource is not expected to be an image, or
-  if the user agent opts not to apply those rules, then the user agent
-  must use the resource's <span title="Content-Type">Content-Type
-  metadata</span> to determine the type of the resource. If there is
-  no type metadata, but the external resource link type has a default
-  type defined, then the user agent must assume that the resource is
-  of that type.</p>
+  <p id="concept-link-type-sniffing">If the resource is expected to be
+  an image, user agents may apply the <span title="Content-Type
+  sniffing: image">image sniffing rules</span>, with the <var
+  title="">official type</var> being the type determined from the
+  resource's <span title="Content-Type">Content-Type metadata</span>,
+  and use the resulting sniffed type of the resource as if it was the
+  actual type. Otherwise, if the resource is not expected to be an
+  image, or if the user agent opts not to apply those rules, then the
+  user agent must use the resource's <span
+  title="Content-Type">Content-Type metadata</span> to determine the
+  type of the resource. If there is no type metadata, but the external
+  resource link type has a default type defined, then the user agent
+  must assume that the resource is of that type.</p>
 
   <p>Once the user agent has established the type of the resource, the
   user agent must apply the resource if it is of a supported type and
@@ -34097,8 +34097,9 @@
   as determined by the attributes.</p>
 
   <p>There is no default type for resources given by the <code
-  title="rel-icon">icon</code> keyword.</p> <!-- XXX we don't define
-  the content-type sniffing for this keyword -->
+  title="rel-icon">icon</code> keyword. However, for the purposes of
+  <a href="#concept-link-type-sniffing">determining the type of the
+  resource</a>, user agents must expect the resource to be an image.</p>
 
   <p>The <dfn title="attr-link-sizes"><code>sizes</code></dfn>
   attribute gives the sizes of icons for visual media.</p>