[html5] r3728 - [giow] (2) Make <object> type handling more compatible with reality. (based on i [...]

whatwg at whatwg.org whatwg at whatwg.org
Wed Sep 2 14:39:22 PDT 2009


Author: ianh
Date: 2009-09-02 14:39:21 -0700 (Wed, 02 Sep 2009)
New Revision: 3728

Modified:
   index
   source
Log:
[giow] (2) Make <object> type handling more compatible with reality. (based on implementor feedback)

Modified: index
===================================================================
--- index	2009-09-02 01:14:42 UTC (rev 3727)
+++ index	2009-09-02 21:39:21 UTC (rev 3728)
@@ -5132,8 +5132,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
@@ -20020,20 +20023,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

Modified: source
===================================================================
--- source	2009-09-02 01:14:42 UTC (rev 3727)
+++ source	2009-09-02 21:39:21 UTC (rev 3728)
@@ -4840,9 +4840,11 @@
   href="#refsMIMESNIFF">[MIMESNIFF]</a></p>
 
   <p>The <dfn 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 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 <span>MIME type</span> 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
@@ -21537,23 +21539,46 @@
 
        <li>
 
-        <p>If the resource has <span title="Content-Type">associated
-        Content-Type metadata</span>, then let the <var
-        title="">resource type</var> be the type specified in <span
-        title="Content-Type">the resource's Content-Type
-        metadata</span>.</p>
+        <p>If there is a <code title="attr-object-type">type</code>
+        attribute present on the <code>object</code> element, and that
+        attribute's value is a type that a <span>plugin</span>
+        supports, then let the <var title="">resource type</var> be
+        the type specified in that <code
+        title="attr-object-type">type</code> attribute.</p>
 
        </li>
 
        <li>
 
+        <p>Otherwise, if the <var title="">resource type</var> is
+        unknown, and the resource has <span
+        title="Content-Type">associated Content-Type metadata</span>,
+        then let the <var title="">resource type</var> be the type
+        specified in <span title="Content-Type">the resource's
+        Content-Type metadata</span>.</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
+        <span title="Content-Type sniffing: text or binary">rules for
+        distingushing if a resource is text or binary</span> 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">type</code> attribute present
-        on the <code>object</code> element, then change the <var
-        title="">resource type</var> to instead be the type specified
-        in that <code title="attr-object-type">type</code>
-        attribute.</p>
+        "<code title="">application/octet-stream</code>" at this point
+        and there is a <code title="attr-object-type">type</code>
+        attribute present on the <code>object</code> element, then
+        change the <var title="">resource type</var> to instead be the
+        type specified in that <code
+        title="attr-object-type">type</code> attribute.</p>
 
         <p>Otherwise, if the <var title="">resource type</var> is
         "<code title="">application/octet-stream</code>" but there is




More information about the Commit-Watchers mailing list