Skip to content

Commit

Permalink
[giow] (0) revert r5836 per http://lists.w3.org/Archives/Public/publi…
Browse files Browse the repository at this point in the history
  • Loading branch information
Hixie committed Mar 1, 2011
1 parent 05500b1 commit ab03111
Show file tree
Hide file tree
Showing 3 changed files with 78 additions and 5 deletions.
28 changes: 26 additions & 2 deletions complete.html
Expand Up @@ -239,7 +239,7 @@

<header class=head id=head><p><a class=logo href=http://www.whatwg.org/ rel=home><img alt=WHATWG height=101 src=/images/logo width=101></a></p>
<hgroup><h1>Web Applications 1.0</h1>
<h2 class="no-num no-toc">Living Standard &mdash; Last Updated 28 February 2011</h2>
<h2 class="no-num no-toc">Living Standard &mdash; Last Updated 1 March 2011</h2>
</hgroup><p>You can take part in this work. <a href=http://www.whatwg.org/mailing-list>Join the working group's discussion list.</a></p>
<p><strong>Web designers!</strong> We have a <a href=http://blog.whatwg.org/faq/>FAQ</a>, a <a href=http://forums.whatwg.org/>forum</a>, and a <a href=http://www.whatwg.org/mailing-list#help>help mailing list</a> for you!</p>
<!--<p class="impl"><strong>Implementors!</strong> We have a <a href="http://www.whatwg.org/mailing-list#implementors">mailing list</a> for you too!</p>-->
Expand Down Expand Up @@ -25871,6 +25871,22 @@ <h5 id=mime-types><span class=secno>4.8.10.3 </span>MIME types</h5>
not support, for example because it doesn't recognize the container
type, or it doesn't support the listed codecs.</p>

<p>The <a href=#mime-type>MIME type</a>
"<code>application/octet-stream</code>" with no parameters is never
<a href=#a-type-that-the-user-agent-knows-it-cannot-render>a type that the user agent knows it cannot render</a>. User
agents must treat that type as equivalent to the lack of any
explicit <a href=#content-type title=Content-Type>Content-Type metadata</a>
when it is used to label a potential <a href=#media-resource>media
resource</a>.</p>

<p class=note>In the absence of a <!-- pretty crazy -->
specification to the contrary, the <a href=#mime-type>MIME type</a>
"<code>application/octet-stream</code>" when used <em>with</em>
parameters, e.g.
"<code>application/octet-stream;codecs=theora</code>", <em>is</em>
<a href=#a-type-that-the-user-agent-knows-it-cannot-render>a type that the user agent knows it cannot render</a>,
since that parameter is not defined for that type.</p>

<dl class=domintro><dt><var title="">media</var> . <code title=dom-navigator-canPlayType><a href=#dom-navigator-canplaytype>canPlayType</a></code>(<var title="">type</var>)</dt>

<dd>
Expand All @@ -25885,7 +25901,8 @@ <h5 id=mime-types><span class=secno>4.8.10.3 </span>MIME types</h5>

<p>The <dfn id=dom-navigator-canplaytype title=dom-navigator-canPlayType><code>canPlayType(<var title="">type</var>)</code></dfn> method must return the empty
string if <var title="">type</var> is <a href=#a-type-that-the-user-agent-knows-it-cannot-render>a type that the user
agent knows it cannot render</a>; it must return "<code title="">probably</code>" if the user agent is confident that the
agent knows it cannot render</a> or is the type
"<code>application/octet-stream</code>"; it must return "<code title="">probably</code>" if the user agent is confident that the
type represents a <a href=#media-resource>media resource</a> that it can render if
used in with this <code><a href=#audio>audio</a></code> or <code><a href=#video>video</a></code> element;
and it must return "<code title="">maybe</code>" otherwise.
Expand Down Expand Up @@ -26450,6 +26467,13 @@ <h5 id=loading-the-media-resource><span class=secno>4.8.10.5 </span>Loading the
to network errors, causing the user agent to give up trying to
fetch the resource</dt>

<dt>If the <a href=#media-resource>media resource</a> is found to have <a href=#content-type title=Content-Type>Content-Type metadata</a> that, when
parsed as a <a href=#mime-type>MIME type</a> (including any codecs
described by the <code title="">codecs</code> parameter, if the
parameter is defined for that type), represents <a href=#a-type-that-the-user-agent-knows-it-cannot-render>a type that
the user agent knows it cannot render</a> (even if the actual
<a href=#media-data>media data</a> is in a supported format)</dt>

<dt>If the <a href=#media-data>media data</a> can be fetched but is found by
inspection to be in an unsupported format, or can otherwise not
be rendered at all</dt>
Expand Down
28 changes: 26 additions & 2 deletions index
Expand Up @@ -243,7 +243,7 @@

<header class=head id=head><p><a class=logo href=http://www.whatwg.org/ rel=home><img alt=WHATWG height=101 src=/images/logo width=101></a></p>
<hgroup><h1 class=allcaps>HTML</h1>
<h2 class="no-num no-toc">Living Standard &mdash; Last Updated 28 February 2011</h2>
<h2 class="no-num no-toc">Living Standard &mdash; Last Updated 1 March 2011</h2>
</hgroup><p>You can take part in this work. <a href=http://www.whatwg.org/mailing-list>Join the working group's discussion list.</a></p>
<p><strong>Web designers!</strong> We have a <a href=http://blog.whatwg.org/faq/>FAQ</a>, a <a href=http://forums.whatwg.org/>forum</a>, and a <a href=http://www.whatwg.org/mailing-list#help>help mailing list</a> for you!</p>
<!--<p class="impl"><strong>Implementors!</strong> We have a <a href="http://www.whatwg.org/mailing-list#implementors">mailing list</a> for you too!</p>-->
Expand Down Expand Up @@ -25854,6 +25854,22 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
not support, for example because it doesn't recognize the container
type, or it doesn't support the listed codecs.</p>

<p>The <a href=#mime-type>MIME type</a>
"<code>application/octet-stream</code>" with no parameters is never
<a href=#a-type-that-the-user-agent-knows-it-cannot-render>a type that the user agent knows it cannot render</a>. User
agents must treat that type as equivalent to the lack of any
explicit <a href=#content-type title=Content-Type>Content-Type metadata</a>
when it is used to label a potential <a href=#media-resource>media
resource</a>.</p>

<p class=note>In the absence of a <!-- pretty crazy -->
specification to the contrary, the <a href=#mime-type>MIME type</a>
"<code>application/octet-stream</code>" when used <em>with</em>
parameters, e.g.
"<code>application/octet-stream;codecs=theora</code>", <em>is</em>
<a href=#a-type-that-the-user-agent-knows-it-cannot-render>a type that the user agent knows it cannot render</a>,
since that parameter is not defined for that type.</p>

<dl class=domintro><dt><var title="">media</var> . <code title=dom-navigator-canPlayType><a href=#dom-navigator-canplaytype>canPlayType</a></code>(<var title="">type</var>)</dt>

<dd>
Expand All @@ -25868,7 +25884,8 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael

<p>The <dfn id=dom-navigator-canplaytype title=dom-navigator-canPlayType><code>canPlayType(<var title="">type</var>)</code></dfn> method must return the empty
string if <var title="">type</var> is <a href=#a-type-that-the-user-agent-knows-it-cannot-render>a type that the user
agent knows it cannot render</a>; it must return "<code title="">probably</code>" if the user agent is confident that the
agent knows it cannot render</a> or is the type
"<code>application/octet-stream</code>"; it must return "<code title="">probably</code>" if the user agent is confident that the
type represents a <a href=#media-resource>media resource</a> that it can render if
used in with this <code><a href=#audio>audio</a></code> or <code><a href=#video>video</a></code> element;
and it must return "<code title="">maybe</code>" otherwise.
Expand Down Expand Up @@ -26433,6 +26450,13 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
to network errors, causing the user agent to give up trying to
fetch the resource</dt>

<dt>If the <a href=#media-resource>media resource</a> is found to have <a href=#content-type title=Content-Type>Content-Type metadata</a> that, when
parsed as a <a href=#mime-type>MIME type</a> (including any codecs
described by the <code title="">codecs</code> parameter, if the
parameter is defined for that type), represents <a href=#a-type-that-the-user-agent-knows-it-cannot-render>a type that
the user agent knows it cannot render</a> (even if the actual
<a href=#media-data>media data</a> is in a supported format)</dt>

<dt>If the <a href=#media-data>media data</a> can be fetched but is found by
inspection to be in an unsupported format, or can otherwise not
be rendered at all</dt>
Expand Down
27 changes: 26 additions & 1 deletion source
Expand Up @@ -27837,6 +27837,22 @@ interface <dfn>HTMLAudioElement</dfn> : <span>HTMLMediaElement</span> {};</pre>
not support, for example because it doesn't recognize the container
type, or it doesn't support the listed codecs.</p>

<p>The <span>MIME type</span>
"<code>application/octet-stream</code>" with no parameters is never
<span>a type that the user agent knows it cannot render</span>. User
agents must treat that type as equivalent to the lack of any
explicit <span title="Content-Type">Content-Type metadata</span>
when it is used to label a potential <span>media
resource</span>.</p>

<p class="note">In the absence of a <!-- pretty crazy -->
specification to the contrary, the <span>MIME type</span>
"<code>application/octet-stream</code>" when used <em>with</em>
parameters, e.g.
"<code>application/octet-stream;codecs=theora</code>", <em>is</em>
<span>a type that the user agent knows it cannot render</span>,
since that parameter is not defined for that type.</p>

<dl class="domintro">

<dt><var title="">media</var> . <code title="dom-navigator-canPlayType">canPlayType</code>(<var title="">type</var>)</dt>
Expand All @@ -27856,7 +27872,8 @@ interface <dfn>HTMLAudioElement</dfn> : <span>HTMLMediaElement</span> {};</pre>
<p>The <dfn title="dom-navigator-canPlayType"><code>canPlayType(<var
title="">type</var>)</code></dfn> method must return the empty
string if <var title="">type</var> is <span>a type that the user
agent knows it cannot render</span>; it must return "<code
agent knows it cannot render</span> or is the type
"<code>application/octet-stream</code>"; it must return "<code
title="">probably</code>" if the user agent is confident that the
type represents a <span>media resource</span> that it can render if
used in with this <code>audio</code> or <code>video</code> element;
Expand Down Expand Up @@ -28548,6 +28565,14 @@ interface <dfn>HTMLAudioElement</dfn> : <span>HTMLMediaElement</span> {};</pre>
to network errors, causing the user agent to give up trying to
fetch the resource</dt>

<dt>If the <span>media resource</span> is found to have <span
title="Content-Type">Content-Type metadata</span> that, when
parsed as a <span>MIME type</span> (including any codecs
described by the <code title="">codecs</code> parameter, if the
parameter is defined for that type), represents <span>a type that
the user agent knows it cannot render</span> (even if the actual
<span>media data</span> is in a supported format)</dt>

<dt>If the <span>media data</span> can be fetched but is found by
inspection to be in an unsupported format, or can otherwise not
be rendered at all</dt>
Expand Down

0 comments on commit ab03111

Please sign in to comment.