[html5] r4708 - [e] (0) Factor out the cleanup steps so they can be reused from other algorithms [...]

whatwg at whatwg.org whatwg at whatwg.org
Sat Feb 13 19:23:50 PST 2010


Author: ianh
Date: 2010-02-13 19:23:36 -0800 (Sat, 13 Feb 2010)
New Revision: 4708

Modified:
   complete.html
   index
   source
Log:
[e] (0) Factor out the cleanup steps so they can be reused from other algorithms.
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=8821

Modified: complete.html
===================================================================
--- complete.html	2010-02-13 13:50:25 UTC (rev 4707)
+++ complete.html	2010-02-14 03:23:36 UTC (rev 4708)
@@ -157,7 +157,7 @@
 
   <header class=head id=head><p><a class=logo href=http://www.whatwg.org/ rel=home><img alt=WHATWG src=/images/logo></a></p>
    <hgroup><h1>Web Applications 1.0</h1>
-    <h2 class="no-num no-toc">Draft Standard — 13 February 2010</h2>
+    <h2 class="no-num no-toc">Draft Standard — 14 February 2010</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>-->
@@ -54797,7 +54797,7 @@
   <p>A <code>Document</code> has a <var title="">salvageable</var>
   state, which is initially true.</p>
 
-  <hr><p>When a user agent is to <dfn id=prompt-to-unload-a-document>prompt to unload a document</dfn>,
+  <p>When a user agent is to <dfn id=prompt-to-unload-a-document>prompt to unload a document</dfn>,
   it must run the following steps.</p>
 
   <ol><li><p>Let <var title="">event</var> be a new
@@ -54863,7 +54863,7 @@
 
     </ol></li>
 
-  </ol><hr><p>When a user agent is to <dfn id=unload-a-document>unload a document</dfn>, it must run
+  </ol><p>When a user agent is to <dfn id=unload-a-document>unload a document</dfn>, it must run
   the following steps. These steps are passed an argument, <var title="">recycle</var>, which is either true or false, indicating
   whether the <code>Document</code> object is going to be
   re-used. (This is set by the <code title=dom-document-open><a href=#dom-document-open>document.open()</a></code> method.)</p>
@@ -54881,26 +54881,10 @@
    <i>unload event</i> step, then set the <code>Document</code>
    object's <var title="">salvageable</var> state to false.</li>
 
-   <li><p>If there are any outstanding transactions that have
-   callbacks that involve <a href=#concept-script title=concept-script>scripts</a>
-   whose <a href="#script's-global-object" title="script's global object">global object</a> is
-   the <code>Document</code>'s <code><a href=#window>Window</a></code> object, roll them
-   back (without invoking any of the callbacks) and set <var title="">salvageable</var> to false.</p>
+   <li><p>Run any <a href=#unloading-document-cleanup-steps>unloading document cleanup steps</a> for
+   <code>Document</code> that are defined by this specification or any
+   other relevant specifications.</li>
 
-   <li><p>Empty the <code>Document</code>'s <code><a href=#window>Window</a></code>'s
-   <a href=#list-of-active-timeouts>list of active timeouts</a> and its <a href=#list-of-active-intervals>list of active
-   intervals</a>.</li> <!-- should this affect var
-   title="">salvageable</var>? -->
-
-   <li><p><a href=#close-the-web-socket-connection>Close the Web Socket connection</a> of any
-   <code><a href=#websocket>WebSocket</a></code> objects that were created by the <code title=dom-WebSocket><a href=#dom-websocket>WebSocket()</a></code> constructor visible on the
-   <code>Document</code>'s <code><a href=#window>Window</a></code> object. If this
-   affected any <code><a href=#websocket>WebSocket</a></code> objects, set <var title="">salvageable</var> to false.</li>
-
-   <li><p>Run any <dfn id=unloading-document-cleanup-steps>unloading document cleanup steps</dfn> for
-   <code>Document</code> that are defined by any other relevant
-   specifications.</li>
-
    <li><p>If this algorithm was invoked by another instance of the
    "unload a document" algorithm (i.e. through the steps below that
    invoke this algorithm for all descendant browsing contexts), then
@@ -54932,6 +54916,28 @@
    <code>Document</code>'s <a href=#browsing-context>browsing context</a> must <a href=#discard-a-document title="discard a document">discard the
    <code>Document</code></a>.</li>
 
+  </ol><p>This specification defines the following <dfn id=unloading-document-cleanup-steps>unloading document
+  cleanup steps</dfn>. Other specifications can define more.</p>
+
+  <ol><li><p>Empty the <code>Document</code>'s <code><a href=#window>Window</a></code>'s
+   <a href=#list-of-active-timeouts>list of active timeouts</a> and its <a href=#list-of-active-intervals>list of active
+   intervals</a>.</li> <!-- XXX Should this affect <var
+   title="">salvageable</var>? Should it happen at all? -->
+
+   <li><p>If there are any outstanding transactions that have
+   callbacks that involve <a href=#concept-script title=concept-script>scripts</a>
+   whose <a href="#script's-global-object" title="script's global object">global object</a> is
+   the <code>Document</code>'s <code><a href=#window>Window</a></code> object, roll them
+   back (without invoking any of the callbacks) and set <var title="">salvageable</var> to false.
+   <a href=#refsWEBSQL>[WEBSQL]</a>
+   </li>
+
+   <li><p><a href=#close-the-web-socket-connection>Close the Web Socket connection</a> of any
+   <code><a href=#websocket>WebSocket</a></code> objects that were created by the <code title=dom-WebSocket><a href=#dom-websocket>WebSocket()</a></code> constructor visible on the
+   <code>Document</code>'s <code><a href=#window>Window</a></code> object. If this
+   affected any <code><a href=#websocket>WebSocket</a></code> objects, set <var title="">salvageable</var> to false.
+   </li>
+
   </ol><h5 id=event-definition><span class=secno>6.5.10.1 </span>Event definition</h5>
 
   </div>

Modified: index
===================================================================
--- index	2010-02-13 13:50:25 UTC (rev 4707)
+++ index	2010-02-14 03:23:36 UTC (rev 4708)
@@ -159,7 +159,7 @@
 
   <header class=head id=head><p><a class=logo href=http://www.whatwg.org/ rel=home><img alt=WHATWG src=/images/logo></a></p>
    <hgroup><h1>HTML5 (including next generation additions still in development)</h1>
-    <h2 class="no-num no-toc">Draft Standard — 13 February 2010</h2>
+    <h2 class="no-num no-toc">Draft Standard — 14 February 2010</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>-->
@@ -54696,7 +54696,7 @@
   <p>A <code>Document</code> has a <var title="">salvageable</var>
   state, which is initially true.</p>
 
-  <hr><p>When a user agent is to <dfn id=prompt-to-unload-a-document>prompt to unload a document</dfn>,
+  <p>When a user agent is to <dfn id=prompt-to-unload-a-document>prompt to unload a document</dfn>,
   it must run the following steps.</p>
 
   <ol><li><p>Let <var title="">event</var> be a new
@@ -54762,7 +54762,7 @@
 
     </ol></li>
 
-  </ol><hr><p>When a user agent is to <dfn id=unload-a-document>unload a document</dfn>, it must run
+  </ol><p>When a user agent is to <dfn id=unload-a-document>unload a document</dfn>, it must run
   the following steps. These steps are passed an argument, <var title="">recycle</var>, which is either true or false, indicating
   whether the <code>Document</code> object is going to be
   re-used. (This is set by the <code title=dom-document-open><a href=#dom-document-open>document.open()</a></code> method.)</p>
@@ -54780,26 +54780,10 @@
    <i>unload event</i> step, then set the <code>Document</code>
    object's <var title="">salvageable</var> state to false.</li>
 
-   <li><p>If there are any outstanding transactions that have
-   callbacks that involve <a href=#concept-script title=concept-script>scripts</a>
-   whose <a href="#script's-global-object" title="script's global object">global object</a> is
-   the <code>Document</code>'s <code><a href=#window>Window</a></code> object, roll them
-   back (without invoking any of the callbacks) and set <var title="">salvageable</var> to false.</p>
+   <li><p>Run any <a href=#unloading-document-cleanup-steps>unloading document cleanup steps</a> for
+   <code>Document</code> that are defined by this specification or any
+   other relevant specifications.</li>
 
-   <li><p>Empty the <code>Document</code>'s <code><a href=#window>Window</a></code>'s
-   <a href=#list-of-active-timeouts>list of active timeouts</a> and its <a href=#list-of-active-intervals>list of active
-   intervals</a>.</li> <!-- should this affect var
-   title="">salvageable</var>? -->
-
-   <li><p><span>Close the Web Socket connection</span> of any
-   <code>WebSocket</code> objects that were created by the <code title=dom-WebSocket>WebSocket()</code> constructor visible on the
-   <code>Document</code>'s <code><a href=#window>Window</a></code> object. If this
-   affected any <code>WebSocket</code> objects, set <var title="">salvageable</var> to false.</li>
-
-   <li><p>Run any <dfn id=unloading-document-cleanup-steps>unloading document cleanup steps</dfn> for
-   <code>Document</code> that are defined by any other relevant
-   specifications.</li>
-
    <li><p>If this algorithm was invoked by another instance of the
    "unload a document" algorithm (i.e. through the steps below that
    invoke this algorithm for all descendant browsing contexts), then
@@ -54831,6 +54815,31 @@
    <code>Document</code>'s <a href=#browsing-context>browsing context</a> must <a href=#discard-a-document title="discard a document">discard the
    <code>Document</code></a>.</li>
 
+  </ol><p>This specification defines the following <dfn id=unloading-document-cleanup-steps>unloading document
+  cleanup steps</dfn>. Other specifications can define more.</p>
+
+  <ol><li><p>Empty the <code>Document</code>'s <code><a href=#window>Window</a></code>'s
+   <a href=#list-of-active-timeouts>list of active timeouts</a> and its <a href=#list-of-active-intervals>list of active
+   intervals</a>.</li> <!-- XXX Should this affect <var
+   title="">salvageable</var>? Should it happen at all? -->
+
+   <li><p>If there are any outstanding transactions that have
+   callbacks that involve <a href=#concept-script title=concept-script>scripts</a>
+   whose <a href="#script's-global-object" title="script's global object">global object</a> is
+   the <code>Document</code>'s <code><a href=#window>Window</a></code> object, roll them
+   back (without invoking any of the callbacks) and set <var title="">salvageable</var> to false.
+   <a href=#refsWEBSQL>[WEBSQL]</a>
+   </li>
+
+   <li><p><span>Close the Web Socket connection</span> of any
+   <code>WebSocket</code> objects that were created by the <code title=dom-WebSocket>WebSocket()</code> constructor visible on the
+   <code>Document</code>'s <code><a href=#window>Window</a></code> object. If this
+   affected any <code>WebSocket</code> objects, set <var title="">salvageable</var> to false.
+   
+   <a href=#refsWEBSOCKET>[WEBSOCKET]</a>
+   
+   </li>
+
   </ol><h5 id=event-definition><span class=secno>6.5.10.1 </span>Event definition</h5>
 
   </div>
@@ -82499,6 +82508,10 @@
    addresses in HTML5</a></cite>, D. Connolly,
    C. Sperberg-McQueen.</dd>
 
+   <dt id=refsWEBSQL>[WEBSQL]</dt>
+   <dd><cite><a href=http://dev.w3.org/html5/webdatabase/>Web SQL
+   Database</a></cite>, I. Hickson. W3C.</dd>
+
    <dt id=refsWEBIDL>[WEBIDL]</dt>
    <!--
    <dd><cite><a href="http://www.w3.org/TR/WebIDL/">Web

Modified: source
===================================================================
--- source	2010-02-13 13:50:25 UTC (rev 4707)
+++ source	2010-02-14 03:23:36 UTC (rev 4708)
@@ -61761,8 +61761,6 @@
   <p>A <code>Document</code> has a <var title="">salvageable</var>
   state, which is initially true.</p>
 
-  <hr>
-
   <p>When a user agent is to <dfn>prompt to unload a document</dfn>,
   it must run the following steps.</p>
 
@@ -61842,8 +61840,6 @@
 
   </ol>
 
-  <hr>
-
   <p>When a user agent is to <dfn>unload a document</dfn>, it must run
   the following steps. These steps are passed an argument, <var
   title="">recycle</var>, which is either true or false, indicating
@@ -61867,29 +61863,10 @@
    <i>unload event</i> step, then set the <code>Document</code>
    object's <var title="">salvageable</var> state to false.</p></li>
 
-   <li><p>If there are any outstanding transactions that have
-   callbacks that involve <span title="concept-script">scripts</span>
-   whose <span title="script's global object">global object</span> is
-   the <code>Document</code>'s <code>Window</code> object, roll them
-   back (without invoking any of the callbacks) and set <var
-   title="">salvageable</var> to false.</p>
+   <li><p>Run any <span>unloading document cleanup steps</span> for
+   <code>Document</code> that are defined by this specification or any
+   other relevant specifications.</p></li>
 
-   <li><p>Empty the <code>Document</code>'s <code>Window</code>'s
-   <span>list of active timeouts</span> and its <span>list of active
-   intervals</span>.</p></li> <!-- should this affect var
-   title="">salvageable</var>? -->
-
-   <li><p><span>Close the Web Socket connection</span> of any
-   <code>WebSocket</code> objects that were created by the <code
-   title="dom-WebSocket">WebSocket()</code> constructor visible on the
-   <code>Document</code>'s <code>Window</code> object. If this
-   affected any <code>WebSocket</code> objects, set <var
-   title="">salvageable</var> to false.</p></li>
-
-   <li><p>Run any <dfn>unloading document cleanup steps</dfn> for
-   <code>Document</code> that are defined by any other relevant
-   specifications.</p></li>
-
    <li><p>If this algorithm was invoked by another instance of the
    "unload a document" algorithm (i.e. through the steps below that
    invoke this algorithm for all descendant browsing contexts), then
@@ -61930,8 +61907,40 @@
 
   </ol>
 
+  <p>This specification defines the following <dfn>unloading document
+  cleanup steps</dfn>. Other specifications can define more.</p>
 
+  <ol>
 
+   <li><p>Empty the <code>Document</code>'s <code>Window</code>'s
+   <span>list of active timeouts</span> and its <span>list of active
+   intervals</span>.</p></li> <!-- XXX Should this affect <var
+   title="">salvageable</var>? Should it happen at all? -->
+
+   <li><p>If there are any outstanding transactions that have
+   callbacks that involve <span title="concept-script">scripts</span>
+   whose <span title="script's global object">global object</span> is
+   the <code>Document</code>'s <code>Window</code> object, roll them
+   back (without invoking any of the callbacks) and set <var
+   title="">salvageable</var> to false.
+   <a href="#refsWEBSQL">[WEBSQL]</a>
+   </p></li>
+
+   <li><p><span>Close the Web Socket connection</span> of any
+   <code>WebSocket</code> objects that were created by the <code
+   title="dom-WebSocket">WebSocket()</code> constructor visible on the
+   <code>Document</code>'s <code>Window</code> object. If this
+   affected any <code>WebSocket</code> objects, set <var
+   title="">salvageable</var> to false.
+   <!--END complete-->
+   <a href="#refsWEBSOCKET">[WEBSOCKET]</a>
+   <!--START complete-->
+   </p></li>
+
+  </ol>
+
+
+
   <h5>Event definition</h5>
 
   </div>




More information about the Commit-Watchers mailing list