Navigation Menu

Skip to content

Commit

Permalink
[e] (0) Rename 'CanPlayTypeEnum' to 'CanPlayTypeResult' for more cons…
Browse files Browse the repository at this point in the history
…istency with how other enums are named.

Affected topics: Video and Audio

git-svn-id: http://svn.whatwg.org/webapps@8597 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
Hixie committed May 2, 2014
1 parent 1bb2b8c commit a7b17d0
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
16 changes: 8 additions & 8 deletions complete.html
Expand Up @@ -290,7 +290,7 @@
</script><body onload=init()>
<header class="head with-buttons" id=head><p><a href=//www.whatwg.org/ class=logo><img width=101 src=/images/logo alt=WHATWG height=101></a></p>
<hgroup><h1 class=allcaps>HTML</h1>
<h2 class="no-num no-toc">Living Standard &mdash; Last Updated 1 May 2014</h2>
<h2 class="no-num no-toc">Living Standard &mdash; Last Updated 2 May 2014</h2>
</hgroup><div>
<div>
<a href=//whatwg.org/html><span><strong>Multipage Version</strong> <code>whatwg.org/html</code></span></a>
Expand Down Expand Up @@ -25443,7 +25443,7 @@ <h4 id=media-elements><span class=secno>4.7.10 </span>Media elements</h4>
<p><dfn id=media-element title="media element">Media elements</dfn> (<code><a href=#the-audio-element>audio</a></code> and <code><a href=#the-video-element>video</a></code>, in
this specification) implement the following interface:</p>

<pre class=idl>enum <dfn id=canplaytypeenum>CanPlayTypeEnum</dfn> { "" /* <a href=#dom-canplaytypeenum-nil title=dom-CanPlayTypeEnum-nil>empty string</a> */, "<a href=#dom-canplaytypeenum-maybe title=dom-CanPlayTypeEnum-maybe>maybe</a>", "<a href=#dom-canplaytypeenum-probably title=dom-CanPlayTypeEnum-probably>probably</a>" };
<pre class=idl>enum <dfn id=canplaytyperesult>CanPlayTypeResult</dfn> { "" /* <a href=#dom-canplaytyperesult-nil title=dom-CanPlayTypeResult-nil>empty string</a> */, "<a href=#dom-canplaytyperesult-maybe title=dom-CanPlayTypeResult-maybe>maybe</a>", "<a href=#dom-canplaytyperesult-probably title=dom-CanPlayTypeResult-probably>probably</a>" };
interface <dfn id=htmlmediaelement>HTMLMediaElement</dfn> : <a href=#htmlelement>HTMLElement</a> {

// error state
Expand All @@ -25463,7 +25463,7 @@ <h4 id=media-elements><span class=secno>4.7.10 </span>Media elements</h4>
readonly attribute boolean <span title="dom-media-bufferingThrottled">bufferingThrottled</span>;
--> readonly attribute <a href=#timeranges>TimeRanges</a> <a href=#dom-media-buffered title=dom-media-buffered>buffered</a>;
void <a href=#dom-media-load title=dom-media-load>load</a>();
<a href=#canplaytypeenum>CanPlayTypeEnum</a> <a href=#dom-navigator-canplaytype title=dom-navigator-canPlayType>canPlayType</a>(DOMString type);
<a href=#canplaytyperesult>CanPlayTypeResult</a> <a href=#dom-navigator-canplaytype title=dom-navigator-canPlayType>canPlayType</a>(DOMString type);

// ready state
const unsigned short <a href=#dom-media-have_nothing title=dom-media-HAVE_NOTHING>HAVE_NOTHING</a> = 0;
Expand Down Expand Up @@ -25743,14 +25743,14 @@ <h5 id=mime-types><span class=secno>4.7.10.3 </span>MIME types</h5>

</dl><div class=impl>

<p>The <dfn id=dom-navigator-canplaytype title=dom-navigator-canPlayType><code>canPlayType(<var title="">type</var>)</code></dfn> method must return <dfn id=dom-canplaytypeenum-nil title=dom-CanPlayTypeEnum-nil>the
<p>The <dfn id=dom-navigator-canplaytype title=dom-navigator-canPlayType><code>canPlayType(<var title="">type</var>)</code></dfn> method must return <dfn id=dom-canplaytyperesult-nil title=dom-CanPlayTypeResult-nil>the
empty string</dfn> 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> or is the type "<code>application/octet-stream</code>"; it must return "<dfn id=dom-canplaytypeenum-probably title=dom-CanPlayTypeEnum-probably><code>probably</code></dfn>" if the user agent is confident
render</a> or is the type "<code>application/octet-stream</code>"; it must return "<dfn id=dom-canplaytyperesult-probably title=dom-CanPlayTypeResult-probably><code>probably</code></dfn>" 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=#the-audio-element>audio</a></code> or <code><a href=#the-video-element>video</a></code> element; and it must return "<dfn id=dom-canplaytypeenum-maybe title=dom-CanPlayTypeEnum-maybe><code>maybe</code></dfn>" otherwise. Implementors are encouraged
to return "<code title=dom-CanPlayTypeEnum-maybe><a href=#dom-canplaytypeenum-maybe>maybe</a></code>" unless the type can be
<code><a href=#the-audio-element>audio</a></code> or <code><a href=#the-video-element>video</a></code> element; and it must return "<dfn id=dom-canplaytyperesult-maybe title=dom-CanPlayTypeResult-maybe><code>maybe</code></dfn>" otherwise. Implementors are encouraged
to return "<code title=dom-CanPlayTypeResult-maybe><a href=#dom-canplaytyperesult-maybe>maybe</a></code>" unless the type can be
confidently established as being supported or not. Generally, a user agent should never return
"<code title=dom-CanPlayTypeEnum-probably><a href=#dom-canplaytypeenum-probably>probably</a></code>" for a type that allows the <code title="">codecs</code> parameter if that parameter is not present.</p>
"<code title=dom-CanPlayTypeResult-probably><a href=#dom-canplaytyperesult-probably>probably</a></code>" for a type that allows the <code title="">codecs</code> parameter if that parameter is not present.</p>

</div>

Expand Down
16 changes: 8 additions & 8 deletions index
Expand Up @@ -290,7 +290,7 @@
</script><body onload=init()>
<header class="head with-buttons" id=head><p><a href=//www.whatwg.org/ class=logo><img width=101 src=/images/logo alt=WHATWG height=101></a></p>
<hgroup><h1 class=allcaps>HTML</h1>
<h2 class="no-num no-toc">Living Standard &mdash; Last Updated 1 May 2014</h2>
<h2 class="no-num no-toc">Living Standard &mdash; Last Updated 2 May 2014</h2>
</hgroup><div>
<div>
<a href=//whatwg.org/html><span><strong>Multipage Version</strong> <code>whatwg.org/html</code></span></a>
Expand Down Expand Up @@ -25443,7 +25443,7 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
<p><dfn id=media-element title="media element">Media elements</dfn> (<code><a href=#the-audio-element>audio</a></code> and <code><a href=#the-video-element>video</a></code>, in
this specification) implement the following interface:</p>

<pre class=idl>enum <dfn id=canplaytypeenum>CanPlayTypeEnum</dfn> { "" /* <a href=#dom-canplaytypeenum-nil title=dom-CanPlayTypeEnum-nil>empty string</a> */, "<a href=#dom-canplaytypeenum-maybe title=dom-CanPlayTypeEnum-maybe>maybe</a>", "<a href=#dom-canplaytypeenum-probably title=dom-CanPlayTypeEnum-probably>probably</a>" };
<pre class=idl>enum <dfn id=canplaytyperesult>CanPlayTypeResult</dfn> { "" /* <a href=#dom-canplaytyperesult-nil title=dom-CanPlayTypeResult-nil>empty string</a> */, "<a href=#dom-canplaytyperesult-maybe title=dom-CanPlayTypeResult-maybe>maybe</a>", "<a href=#dom-canplaytyperesult-probably title=dom-CanPlayTypeResult-probably>probably</a>" };
interface <dfn id=htmlmediaelement>HTMLMediaElement</dfn> : <a href=#htmlelement>HTMLElement</a> {

// error state
Expand All @@ -25463,7 +25463,7 @@ interface <dfn id=htmlmediaelement>HTMLMediaElement</dfn> : <a href=#htmlelement
readonly attribute boolean <span title="dom-media-bufferingThrottled">bufferingThrottled</span>;
--> readonly attribute <a href=#timeranges>TimeRanges</a> <a href=#dom-media-buffered title=dom-media-buffered>buffered</a>;
void <a href=#dom-media-load title=dom-media-load>load</a>();
<a href=#canplaytypeenum>CanPlayTypeEnum</a> <a href=#dom-navigator-canplaytype title=dom-navigator-canPlayType>canPlayType</a>(DOMString type);
<a href=#canplaytyperesult>CanPlayTypeResult</a> <a href=#dom-navigator-canplaytype title=dom-navigator-canPlayType>canPlayType</a>(DOMString type);

// ready state
const unsigned short <a href=#dom-media-have_nothing title=dom-media-HAVE_NOTHING>HAVE_NOTHING</a> = 0;
Expand Down Expand Up @@ -25743,14 +25743,14 @@ interface <dfn id=htmlmediaelement>HTMLMediaElement</dfn> : <a href=#htmlelement

</dl><div class=impl>

<p>The <dfn id=dom-navigator-canplaytype title=dom-navigator-canPlayType><code>canPlayType(<var title="">type</var>)</code></dfn> method must return <dfn id=dom-canplaytypeenum-nil title=dom-CanPlayTypeEnum-nil>the
<p>The <dfn id=dom-navigator-canplaytype title=dom-navigator-canPlayType><code>canPlayType(<var title="">type</var>)</code></dfn> method must return <dfn id=dom-canplaytyperesult-nil title=dom-CanPlayTypeResult-nil>the
empty string</dfn> 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> or is the type "<code>application/octet-stream</code>"; it must return "<dfn id=dom-canplaytypeenum-probably title=dom-CanPlayTypeEnum-probably><code>probably</code></dfn>" if the user agent is confident
render</a> or is the type "<code>application/octet-stream</code>"; it must return "<dfn id=dom-canplaytyperesult-probably title=dom-CanPlayTypeResult-probably><code>probably</code></dfn>" 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=#the-audio-element>audio</a></code> or <code><a href=#the-video-element>video</a></code> element; and it must return "<dfn id=dom-canplaytypeenum-maybe title=dom-CanPlayTypeEnum-maybe><code>maybe</code></dfn>" otherwise. Implementors are encouraged
to return "<code title=dom-CanPlayTypeEnum-maybe><a href=#dom-canplaytypeenum-maybe>maybe</a></code>" unless the type can be
<code><a href=#the-audio-element>audio</a></code> or <code><a href=#the-video-element>video</a></code> element; and it must return "<dfn id=dom-canplaytyperesult-maybe title=dom-CanPlayTypeResult-maybe><code>maybe</code></dfn>" otherwise. Implementors are encouraged
to return "<code title=dom-CanPlayTypeResult-maybe><a href=#dom-canplaytyperesult-maybe>maybe</a></code>" unless the type can be
confidently established as being supported or not. Generally, a user agent should never return
"<code title=dom-CanPlayTypeEnum-probably><a href=#dom-canplaytypeenum-probably>probably</a></code>" for a type that allows the <code title="">codecs</code> parameter if that parameter is not present.</p>
"<code title=dom-CanPlayTypeResult-probably><a href=#dom-canplaytyperesult-probably>probably</a></code>" for a type that allows the <code title="">codecs</code> parameter if that parameter is not present.</p>

</div>

Expand Down
14 changes: 7 additions & 7 deletions source
Expand Up @@ -26926,7 +26926,7 @@ interface <dfn>HTMLAudioElement</dfn> : <span>HTMLMediaElement</span> {};</pre>
<p><dfn data-x="media element">Media elements</dfn> (<code>audio</code> and <code>video</code>, in
this specification) implement the following interface:</p>

<pre class="idl">enum <dfn>CanPlayTypeEnum</dfn> { "" /* <span data-x="dom-CanPlayTypeEnum-nil">empty string</span> */, "<span data-x="dom-CanPlayTypeEnum-maybe">maybe</span>", "<span data-x="dom-CanPlayTypeEnum-probably">probably</span>" };
<pre class="idl">enum <dfn>CanPlayTypeResult</dfn> { "" /* <span data-x="dom-CanPlayTypeResult-nil">empty string</span> */, "<span data-x="dom-CanPlayTypeResult-maybe">maybe</span>", "<span data-x="dom-CanPlayTypeResult-probably">probably</span>" };
interface <dfn>HTMLMediaElement</dfn> : <span>HTMLElement</span> {

// error state
Expand All @@ -26946,7 +26946,7 @@ interface <dfn>HTMLMediaElement</dfn> : <span>HTMLElement</span> {
readonly attribute boolean <span data-x="dom-media-bufferingThrottled">bufferingThrottled</span>;
--> readonly attribute <span>TimeRanges</span> <span data-x="dom-media-buffered">buffered</span>;
void <span data-x="dom-media-load">load</span>();
<span>CanPlayTypeEnum</span> <span data-x="dom-navigator-canPlayType">canPlayType</span>(DOMString type);
<span>CanPlayTypeResult</span> <span data-x="dom-navigator-canPlayType">canPlayType</span>(DOMString type);

// ready state
const unsigned short <span data-x="dom-media-HAVE_NOTHING">HAVE_NOTHING</span> = 0;
Expand Down Expand Up @@ -27257,16 +27257,16 @@ interface <dfn>HTMLMediaElement</dfn> : <span>HTMLElement</span> {
<div class="impl">

<p>The <dfn data-x="dom-navigator-canPlayType"><code>canPlayType(<var
data-x="">type</var>)</code></dfn> method must return <dfn data-x="dom-CanPlayTypeEnum-nil">the
data-x="">type</var>)</code></dfn> method must return <dfn data-x="dom-CanPlayTypeResult-nil">the
empty string</dfn> if <var data-x="">type</var> is <span>a type that the user agent knows it cannot
render</span> or is the type "<code>application/octet-stream</code>"; it must return "<dfn
data-x="dom-CanPlayTypeEnum-probably"><code>probably</code></dfn>" if the user agent is confident
data-x="dom-CanPlayTypeResult-probably"><code>probably</code></dfn>" 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; and it must return "<dfn
data-x="dom-CanPlayTypeEnum-maybe"><code>maybe</code></dfn>" otherwise. Implementors are encouraged
to return "<code data-x="dom-CanPlayTypeEnum-maybe">maybe</code>" unless the type can be
data-x="dom-CanPlayTypeResult-maybe"><code>maybe</code></dfn>" otherwise. Implementors are encouraged
to return "<code data-x="dom-CanPlayTypeResult-maybe">maybe</code>" unless the type can be
confidently established as being supported or not. Generally, a user agent should never return
"<code data-x="dom-CanPlayTypeEnum-probably">probably</code>" for a type that allows the <code
"<code data-x="dom-CanPlayTypeResult-probably">probably</code>" for a type that allows the <code
data-x="">codecs</code> parameter if that parameter is not present.</p>

</div>
Expand Down

0 comments on commit a7b17d0

Please sign in to comment.