[giow] (0) Allow a WebSocket object with only a message handler to be…

… GC'ed once it gets to CLOSING. Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=14651 git-svn-id: http://svn.whatwg.org/webapps@6805 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Nov 1, 2011 · 0c210fc · 0c210fc
1 parent 64ea544
commit 0c210fc
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/complete.html b/complete.html
@@ -80979,10 +80979,16 @@ <h4 id=garbage-collection-2><span class=secno>11.3.7 </span>Garbage collection</
   <code title=event-open>open</code> events, <code title=event-message><a href=#event-message>message</a></code> events, <code title=event-error>error</code> events, or <code title=event-close>close</code> events.</p>
 
   <p>A <code><a href=#websocket>WebSocket</a></code> object whose <code title=dom-WebSocket-readyState><a href=#dom-websocket-readystate>readyState</a></code> attribute's value
-  was set to <code title=dom-WebSocket-OPEN><a href=#dom-websocket-open>OPEN</a></code> (1) or <code title=dom-WebSocket-CLOSING><a href=#dom-websocket-closing>CLOSING</a></code> (2) as of the last time
-  the <a href=#event-loop>event loop</a> started executing a <a href=#concept-task title=concept-task>task</a> must not be garbage collected if
+  was set to <code title=dom-WebSocket-OPEN><a href=#dom-websocket-open>OPEN</a></code> (1) as of
+  the last time the <a href=#event-loop>event loop</a> started executing a <a href=#concept-task title=concept-task>task</a> must not be garbage collected if
   there are any event listeners registered for <code title=event-message><a href=#event-message>message</a></code> events, <code title=event-error>error</code>, or <code title=event-close>close</code> events.</p>
 
+  <p>A <code><a href=#websocket>WebSocket</a></code> object whose <code title=dom-WebSocket-readyState><a href=#dom-websocket-readystate>readyState</a></code> attribute's value
+  was set to <code title=dom-WebSocket-CLOSING><a href=#dom-websocket-closing>CLOSING</a></code> (2) as
+  of the last time the <a href=#event-loop>event loop</a> started executing a
+  <a href=#concept-task title=concept-task>task</a> must not be garbage collected
+  if there are any event listeners registered for <code title=event-error>error</code> or <code title=event-close>close</code> events.</p>
+
   <p>A <code><a href=#websocket>WebSocket</a></code> object with <i title="the WebSocket
   connection is established"><a href=#the-websocket-connection-is-established>an established connection</a></i> that has
   data queued to be transmitted to the network must not be garbage

diff --git a/index b/index
@@ -80979,10 +80979,16 @@ dictionary <dfn id=closeeventinit>CloseEventInit</dfn> : <a href=#eventinit>Even
   <code title=event-open>open</code> events, <code title=event-message><a href=#event-message>message</a></code> events, <code title=event-error>error</code> events, or <code title=event-close>close</code> events.</p>
 
   <p>A <code><a href=#websocket>WebSocket</a></code> object whose <code title=dom-WebSocket-readyState><a href=#dom-websocket-readystate>readyState</a></code> attribute's value
-  was set to <code title=dom-WebSocket-OPEN><a href=#dom-websocket-open>OPEN</a></code> (1) or <code title=dom-WebSocket-CLOSING><a href=#dom-websocket-closing>CLOSING</a></code> (2) as of the last time
-  the <a href=#event-loop>event loop</a> started executing a <a href=#concept-task title=concept-task>task</a> must not be garbage collected if
+  was set to <code title=dom-WebSocket-OPEN><a href=#dom-websocket-open>OPEN</a></code> (1) as of
+  the last time the <a href=#event-loop>event loop</a> started executing a <a href=#concept-task title=concept-task>task</a> must not be garbage collected if
   there are any event listeners registered for <code title=event-message><a href=#event-message>message</a></code> events, <code title=event-error>error</code>, or <code title=event-close>close</code> events.</p>
 
+  <p>A <code><a href=#websocket>WebSocket</a></code> object whose <code title=dom-WebSocket-readyState><a href=#dom-websocket-readystate>readyState</a></code> attribute's value
+  was set to <code title=dom-WebSocket-CLOSING><a href=#dom-websocket-closing>CLOSING</a></code> (2) as
+  of the last time the <a href=#event-loop>event loop</a> started executing a
+  <a href=#concept-task title=concept-task>task</a> must not be garbage collected
+  if there are any event listeners registered for <code title=event-error>error</code> or <code title=event-close>close</code> events.</p>
+
   <p>A <code><a href=#websocket>WebSocket</a></code> object with <i title="the WebSocket
   connection is established"><a href=#the-websocket-connection-is-established>an established connection</a></i> that has
   data queued to be transmitted to the network must not be garbage

diff --git a/source b/source
@@ -91689,15 +91689,23 @@ dictionary <dfn>CloseEventInit</dfn> : <span>EventInit</span> {
 
   <p>A <code>WebSocket</code> object whose <code
   title="dom-WebSocket-readyState">readyState</code> attribute's value
-  was set to <code title="dom-WebSocket-OPEN">OPEN</code> (1) or <code
-  title="dom-WebSocket-CLOSING">CLOSING</code> (2) as of the last time
-  the <span>event loop</span> started executing a <span
+  was set to <code title="dom-WebSocket-OPEN">OPEN</code> (1) as of
+  the last time the <span>event loop</span> started executing a <span
   title="concept-task">task</span> must not be garbage collected if
   there are any event listeners registered for <code
   title="event-message">message</code> events, <code
   title="event-error">error</code>, or <code
   title="event-close">close</code> events.</p>
 
+  <p>A <code>WebSocket</code> object whose <code
+  title="dom-WebSocket-readyState">readyState</code> attribute's value
+  was set to <code title="dom-WebSocket-CLOSING">CLOSING</code> (2) as
+  of the last time the <span>event loop</span> started executing a
+  <span title="concept-task">task</span> must not be garbage collected
+  if there are any event listeners registered for <code
+  title="event-error">error</code> or <code
+  title="event-close">close</code> events.</p>
+
   <p>A <code>WebSocket</code> object with <i title="the WebSocket
   connection is established">an established connection</i> that has
   data queued to be transmitted to the network must not be garbage