Skip to content

Commit

Permalink
[giow] (0) Four browser vendors have told me they don't want to drop …
Browse files Browse the repository at this point in the history 
…this, so yeah, I'm putting it back. Sorry Anne. :-)

Affected topics: DOM APIs, HTML, WebSocket API

git-svn-id: http://svn.whatwg.org/webapps@7203 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
@Hixie
Hixie committed Jul 25, 2012
1 parent bc6a8c7 commit 428a0c6
Show file tree
Hide file tree
Showing 3 changed files with 117 additions and 29 deletions.
50 changes: 39 additions & 11 deletions complete.html
View file
Expand Up @@ -244,7 +244,7 @@

<header class=head id=head><p><a class=logo href=http://www.whatwg.org/><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 24 July 2012</h2>
<h2 class="no-num no-toc">Living Standard &mdash; Last Updated 25 July 2012</h2>
</hgroup><dl><dt><strong>Web developer edition:</strong></dt>
<dd><strong><a href=http://developers.whatwg.org/>http://developers.whatwg.org/</a></strong></dd>
<dt>Multiple-page version:</dt>
Expand Down Expand Up @@ -4031,11 +4031,12 @@ <h4 id=dependencies><span class=secno>2.2.2 </span>Dependencies</h4>

<dd>

<p>The <dfn id=arraybuffer>ArrayBuffer</dfn> interface and underlying concepts
from the Typed Array Specification are used for several features
in this specification. The <dfn id=uint8clampedarray>Uint8ClampedArray</dfn> interface
type is specifically used in the definition of the
<code><a href=#the-canvas-element>canvas</a></code> element's 2D API. <a href=#refsTYPEDARRAY>[TYPEDARRAY]</a></p>
<p>The <dfn id=arraybuffer>ArrayBuffer</dfn> and <dfn id=arraybufferview>ArrayBufferView</dfn>
interfaces and underlying concepts from the Typed Array
Specification are used for several features in this specification.
The <dfn id=uint8clampedarray>Uint8ClampedArray</dfn> interface type is specifically
used in the definition of the <code><a href=#the-canvas-element>canvas</a></code> element's 2D
API. <a href=#refsTYPEDARRAY>[TYPEDARRAY]</a></p>

</dd>

Expand Down Expand Up @@ -82938,8 +82939,9 @@ <h4 id=the-websocket-interface><span class=secno>10.3.2 </span>The <code><a href
attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-websocket-onmessage title=handler-WebSocket-onmessage>onmessage</a>;
attribute DOMString <a href=#dom-websocket-binarytype title=dom-WebSocket-binaryType>binaryType</a>;
void <a href=#dom-websocket-send title=dom-WebSocket-send>send</a>(DOMString data);
void <a href=#dom-websocket-send title=dom-WebSocket-send>send</a>(<span>ArrayBufferView</span> data);
void <a href=#dom-websocket-send title=dom-WebSocket-send>send</a>(<a href=#blob>Blob</a> data);
void <a href=#dom-websocket-send title=dom-WebSocket-send>send</a>(<a href=#arraybuffer>ArrayBuffer</a> data);
void <a href=#dom-websocket-send title=dom-WebSocket-send>send</a>(<a href=#arraybufferview>ArrayBufferView</a> data);
};</pre>

<p>The <dfn id=dom-websocket title=dom-WebSocket><code>WebSocket(<var title="">url</var>, <var title="">protocols</var>)</code></dfn>
Expand Down Expand Up @@ -83309,7 +83311,33 @@ <h4 id=the-websocket-interface><span class=secno>10.3.2 </span>The <code><a href
</dd>


<dt>If the argument is an <code>ArrayBufferView</code> object</dt>
<dt>If the argument is an <code><a href=#arraybuffer>ArrayBuffer</a></code> object</dt>

<dd>

<p>If <i><a href=#the-websocket-connection-is-established>the WebSocket connection is established</a></i>, and <i title="the WebSocket closing handshake is started"><a href=#the-websocket-closing-handshake-is-started>the WebSocket
closing handshake has not yet started</a></i>, then the user agent
must <i>send a WebSocket Message</i> comprised of <var title="">data</var> using a binary frame opcode; if the data
cannot be sent, e.g. because it would need to be buffered but the
buffer is full, the user agent must <i><a href=#close-the-websocket-connection>close the WebSocket
connection</a></i> <a href=#concept-websocket-close-fail title=concept-websocket-close-fail>with
prejudice</a>. The data to be sent is the data stored in the
buffer described by the <code><a href=#arraybuffer>ArrayBuffer</a></code> object. <!-- that
sentence is meant to invoke "The ArrayBuffer type describes a
buffer used to store data for the array buffer views." at the top
of the Typed Array spec, and "Optional byteOffset and length can
be used to limit the section of the buffer referenced" in the
definition of the TypedArray constructor --> Any invocation of
this method with an <code><a href=#arraybuffer>ArrayBuffer</a></code> argument that does
not throw an exception must increase the <code title=dom-WebSocket-bufferedAmount><a href=#dom-websocket-bufferedamount>bufferedAmount</a></code>
attribute by the length of the <code><a href=#arraybuffer>ArrayBuffer</a></code> in bytes.
<!-- that sentence is meant to invoke the same as
ArrayBuffer.byteLength --> <a href=#refsWSP>[WSP]</a> <a href=#refsTYPEDARRAY>[TYPEDARRAY]</a></p>

</dd>


<dt>If the argument is an <code><a href=#arraybufferview>ArrayBufferView</a></code> object</dt>

<dd>

Expand All @@ -83321,15 +83349,15 @@ <h4 id=the-websocket-interface><span class=secno>10.3.2 </span>The <code><a href
connection</a></i> <a href=#concept-websocket-close-fail title=concept-websocket-close-fail>with
prejudice</a>. The data to be sent is the data stored in the
section of the buffer described by the <code><a href=#arraybuffer>ArrayBuffer</a></code>
object that the <code>ArrayBufferView</code> object references.
object that the <code><a href=#arraybufferview>ArrayBufferView</a></code> object references.
<!-- that sentence is meant to invoke "The ArrayBuffer type
describes a buffer used to store data for the array buffer views."
at the top of the Typed Array spec, and "Optional byteOffset and
length can be used to limit the section of the buffer referenced"
in the definition of the TypedArray constructor --> Any invocation
of this method with an <code>ArrayBufferView</code> argument that
of this method with an <code><a href=#arraybufferview>ArrayBufferView</a></code> argument that
does not throw an exception must increase the <code title=dom-WebSocket-bufferedAmount><a href=#dom-websocket-bufferedamount>bufferedAmount</a></code>
attribute by the length of the <code>ArrayBufferView</code> in
attribute by the length of the <code><a href=#arraybufferview>ArrayBufferView</a></code> in
bytes. <!-- that sentence is meant to invoke the same as
ArrayBufferView.byteLength --> <a href=#refsWSP>[WSP]</a> <a href=#refsTYPEDARRAY>[TYPEDARRAY]</a></p>

Expand Down
50 changes: 39 additions & 11 deletions index
View file
Expand Up @@ -244,7 +244,7 @@

<header class=head id=head><p><a class=logo href=http://www.whatwg.org/><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 24 July 2012</h2>
<h2 class="no-num no-toc">Living Standard &mdash; Last Updated 25 July 2012</h2>
</hgroup><dl><dt><strong>Web developer edition:</strong></dt>
<dd><strong><a href=http://developers.whatwg.org/>http://developers.whatwg.org/</a></strong></dd>
<dt>Multiple-page version:</dt>
Expand Down Expand Up @@ -4031,11 +4031,12 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d

<dd>

<p>The <dfn id=arraybuffer>ArrayBuffer</dfn> interface and underlying concepts
from the Typed Array Specification are used for several features
in this specification. The <dfn id=uint8clampedarray>Uint8ClampedArray</dfn> interface
type is specifically used in the definition of the
<code><a href=#the-canvas-element>canvas</a></code> element's 2D API. <a href=#refsTYPEDARRAY>[TYPEDARRAY]</a></p>
<p>The <dfn id=arraybuffer>ArrayBuffer</dfn> and <dfn id=arraybufferview>ArrayBufferView</dfn>
interfaces and underlying concepts from the Typed Array
Specification are used for several features in this specification.
The <dfn id=uint8clampedarray>Uint8ClampedArray</dfn> interface type is specifically
used in the definition of the <code><a href=#the-canvas-element>canvas</a></code> element's 2D
API. <a href=#refsTYPEDARRAY>[TYPEDARRAY]</a></p>

</dd>

Expand Down Expand Up @@ -82938,8 +82939,9 @@ interface <dfn id=websocket>WebSocket</dfn> : <a href=#eventtarget>EventTarget</
attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-websocket-onmessage title=handler-WebSocket-onmessage>onmessage</a>;
attribute DOMString <a href=#dom-websocket-binarytype title=dom-WebSocket-binaryType>binaryType</a>;
void <a href=#dom-websocket-send title=dom-WebSocket-send>send</a>(DOMString data);
void <a href=#dom-websocket-send title=dom-WebSocket-send>send</a>(<span>ArrayBufferView</span> data);
void <a href=#dom-websocket-send title=dom-WebSocket-send>send</a>(<a href=#blob>Blob</a> data);
void <a href=#dom-websocket-send title=dom-WebSocket-send>send</a>(<a href=#arraybuffer>ArrayBuffer</a> data);
void <a href=#dom-websocket-send title=dom-WebSocket-send>send</a>(<a href=#arraybufferview>ArrayBufferView</a> data);
};</pre>

<p>The <dfn id=dom-websocket title=dom-WebSocket><code>WebSocket(<var title="">url</var>, <var title="">protocols</var>)</code></dfn>
Expand Down Expand Up @@ -83309,7 +83311,33 @@ socket.onopen = function () {
</dd>


<dt>If the argument is an <code>ArrayBufferView</code> object</dt>
<dt>If the argument is an <code><a href=#arraybuffer>ArrayBuffer</a></code> object</dt>

<dd>

<p>If <i><a href=#the-websocket-connection-is-established>the WebSocket connection is established</a></i>, and <i title="the WebSocket closing handshake is started"><a href=#the-websocket-closing-handshake-is-started>the WebSocket
closing handshake has not yet started</a></i>, then the user agent
must <i>send a WebSocket Message</i> comprised of <var title="">data</var> using a binary frame opcode; if the data
cannot be sent, e.g. because it would need to be buffered but the
buffer is full, the user agent must <i><a href=#close-the-websocket-connection>close the WebSocket
connection</a></i> <a href=#concept-websocket-close-fail title=concept-websocket-close-fail>with
prejudice</a>. The data to be sent is the data stored in the
buffer described by the <code><a href=#arraybuffer>ArrayBuffer</a></code> object. <!-- that
sentence is meant to invoke "The ArrayBuffer type describes a
buffer used to store data for the array buffer views." at the top
of the Typed Array spec, and "Optional byteOffset and length can
be used to limit the section of the buffer referenced" in the
definition of the TypedArray constructor --> Any invocation of
this method with an <code><a href=#arraybuffer>ArrayBuffer</a></code> argument that does
not throw an exception must increase the <code title=dom-WebSocket-bufferedAmount><a href=#dom-websocket-bufferedamount>bufferedAmount</a></code>
attribute by the length of the <code><a href=#arraybuffer>ArrayBuffer</a></code> in bytes.
<!-- that sentence is meant to invoke the same as
ArrayBuffer.byteLength --> <a href=#refsWSP>[WSP]</a> <a href=#refsTYPEDARRAY>[TYPEDARRAY]</a></p>

</dd>


<dt>If the argument is an <code><a href=#arraybufferview>ArrayBufferView</a></code> object</dt>

<dd>

Expand All @@ -83321,15 +83349,15 @@ socket.onopen = function () {
connection</a></i> <a href=#concept-websocket-close-fail title=concept-websocket-close-fail>with
prejudice</a>. The data to be sent is the data stored in the
section of the buffer described by the <code><a href=#arraybuffer>ArrayBuffer</a></code>
object that the <code>ArrayBufferView</code> object references.
object that the <code><a href=#arraybufferview>ArrayBufferView</a></code> object references.
<!-- that sentence is meant to invoke "The ArrayBuffer type
describes a buffer used to store data for the array buffer views."
at the top of the Typed Array spec, and "Optional byteOffset and
length can be used to limit the section of the buffer referenced"
in the definition of the TypedArray constructor --> Any invocation
of this method with an <code>ArrayBufferView</code> argument that
of this method with an <code><a href=#arraybufferview>ArrayBufferView</a></code> argument that
does not throw an exception must increase the <code title=dom-WebSocket-bufferedAmount><a href=#dom-websocket-bufferedamount>bufferedAmount</a></code>
attribute by the length of the <code>ArrayBufferView</code> in
attribute by the length of the <code><a href=#arraybufferview>ArrayBufferView</a></code> in
bytes. <!-- that sentence is meant to invoke the same as
ArrayBufferView.byteLength --> <a href=#refsWSP>[WSP]</a> <a href=#refsTYPEDARRAY>[TYPEDARRAY]</a></p>

Expand Down
46 changes: 39 additions & 7 deletions source
View file
Expand Up @@ -20,6 +20,7 @@
interface FileCallback { }; // File API
interface FileList { }; // File API
interface ArrayBuffer { }; // WebGL
interface ArrayBufferView { }; // WebGL
interface Uint8ClampedArray { }; // WebGL
interface XMLDocument { }; // DOM Core
interface HTMLCollection { }; // DOM Core
Expand Down Expand Up @@ -2988,12 +2989,12 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d

<dd>

<p>The <dfn>ArrayBuffer</dfn> interface and underlying concepts
from the Typed Array Specification are used for several features
in this specification. The <dfn>Uint8ClampedArray</dfn> interface
type is specifically used in the definition of the
<code>canvas</code> element's 2D API. <a
href="#refsTYPEDARRAY">[TYPEDARRAY]</a></p>
<p>The <dfn>ArrayBuffer</dfn> and <dfn>ArrayBufferView</dfn>
interfaces and underlying concepts from the Typed Array
Specification are used for several features in this specification.
The <dfn>Uint8ClampedArray</dfn> interface type is specifically
used in the definition of the <code>canvas</code> element's 2D
API. <a href="#refsTYPEDARRAY">[TYPEDARRAY]</a></p>

</dd>

Expand Down Expand Up @@ -96382,8 +96383,9 @@ interface <dfn>WebSocket</dfn> : <span>EventTarget</span> {
attribute <span>EventHandler</span> <span title="handler-WebSocket-onmessage">onmessage</span>;
attribute DOMString <span title="dom-WebSocket-binaryType">binaryType</span>;
void <span title="dom-WebSocket-send">send</span>(DOMString data);
void <span title="dom-WebSocket-send">send</span>(<span>ArrayBufferView</span> data);
void <span title="dom-WebSocket-send">send</span>(<span>Blob</span> data);
void <span title="dom-WebSocket-send">send</span>(<span>ArrayBuffer</span> data);
void <span title="dom-WebSocket-send">send</span>(<span>ArrayBufferView</span> data);
};</pre>

<p>The <dfn title="dom-WebSocket"><code>WebSocket(<var
Expand Down Expand Up @@ -96838,6 +96840,36 @@ socket.onopen = function () {
</dd>


<dt>If the argument is an <code>ArrayBuffer</code> object</dt>

<dd>

<p>If <i>the WebSocket connection is established</i>, and <i
title="the WebSocket closing handshake is started">the WebSocket
closing handshake has not yet started</i>, then the user agent
must <i>send a WebSocket Message</i> comprised of <var
title="">data</var> using a binary frame opcode; if the data
cannot be sent, e.g. because it would need to be buffered but the
buffer is full, the user agent must <i>close the WebSocket
connection</i> <span title="concept-websocket-close-fail">with
prejudice</span>. The data to be sent is the data stored in the
buffer described by the <code>ArrayBuffer</code> object. <!-- that
sentence is meant to invoke "The ArrayBuffer type describes a
buffer used to store data for the array buffer views." at the top
of the Typed Array spec, and "Optional byteOffset and length can
be used to limit the section of the buffer referenced" in the
definition of the TypedArray constructor --> Any invocation of
this method with an <code>ArrayBuffer</code> argument that does
not throw an exception must increase the <code
title="dom-WebSocket-bufferedAmount">bufferedAmount</code>
attribute by the length of the <code>ArrayBuffer</code> in bytes.
<!-- that sentence is meant to invoke the same as
ArrayBuffer.byteLength --> <a href="#refsWSP">[WSP]</a> <a
href="#refsTYPEDARRAY">[TYPEDARRAY]</a></p>

</dd>


<dt>If the argument is an <code>ArrayBufferView</code> object</dt>

<dd>
Expand Down

0 comments on commit 428a0c6

Please sign in to comment.