Short URL: http://html5.org/r/6949
| SVN | Bug | Comment | Time (UTC) |
|---|---|---|---|
| 6949 | 14907 | 2012-01-31 20:20 |
Index: source
===================================================================
--- source (revision 6948)
+++ source (revision 6949)
@@ -75957,8 +75957,7 @@
<li><p>If the <code>Document</code>'s <var
title="concept-document-salvageable">salvageable</var> state is
false, 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>
+ <span>list of active timers</span>.</p></li>
</ol>
@@ -80672,11 +80671,10 @@
</p>
<p>Each object that implements the <code>WindowTimers</code>
- interface has a <dfn>list of active timeouts</dfn> and a <dfn>list
- of active intervals</dfn>. Each entry in these lists is identified
- by a number, which must be unique within its list for the lifetime
- of the object that implements the <code>WindowTimers</code>
- interface.</p>
+ interface has a <dfn>list of active timers</dfn>. Each entry in this
+ lists is identified by a number, which must be unique within the
+ list for the lifetime of the object that implements the
+ <code>WindowTimers</code> interface.</p>
<hr>
@@ -80686,15 +80684,16 @@
<ol>
- <li><p>Let <var title="">handle</var> be a user-agent-defined integer
- that is greater than zero that will identify the timeout to be set
- by this call.</p></li>
+ <li><p>Let <var title="">handle</var> be a user-agent-defined
+ integer that is greater than zero that will identify the timeout to
+ be set by this call in the <span>list of active
+ timers</span>.</p></li>
- <li><p>Add an entry to the <span>list of active timeouts</span> for
+ <li><p>Add an entry to the <span>list of active timers</span> for
<var title="">handle</var>.</p></li>
- <li><p><span>Get the timed task</span> <var title="">handle</var> in
- the <span>list of active timeouts</span>, and let <var
+ <li><p><span>Get the timed task</span> <var title="">handle</var>
+ in the <span>list of active timers</span>, and let <var
title="">task</var> be the result.</p></li>
<li><p>Let <var title="">timeout</var> be the second argument to
@@ -80779,17 +80778,6 @@
</ol>
- <p>The <dfn
- title="dom-windowtimers-clearTimeout"><code>clearTimeout()</code></dfn>
- method must clear the entry identified as <var title="">handle</var>
- from the <span>list of active timeouts</span> of the
- <code>WindowTimers</code> object on which the method was invoked,
- where <var title="">handle</var> is the argument passed to the
- method, if any. (If <var title="">handle</var> does not identify an
- entry in the <span>list of active timeouts</span> of the
- <code>WindowTimers</code> object on which the method was invoked,
- the method does nothing.)</p>
-
<hr>
<p>The <dfn
@@ -80798,15 +80786,16 @@
<ol>
- <li><p>Let <var title="">handle</var> be a user-agent-defined integer
- that is greater than zero that will identify the interval to be set
- by this call.</p></li>
+ <li><p>Let <var title="">handle</var> be a user-agent-defined
+ integer that is greater than zero that will identify the timeout to
+ be set by this call in the <span>list of active
+ timers</span>.</p></li>
- <li><p>Add an entry to the <span>list of active intervals</span> for
+ <li><p>Add an entry to the <span>list of active timers</span> for
<var title="">handle</var>.</p></li>
- <li><p><span>Get the timed task</span> <var title="">handle</var> in
- the <span>list of active intervals</span>, and let <var
+ <li><p><span>Get the timed task</span> <var title="">handle</var>
+ in the <span>list of active timers</span>, and let <var
title="">task</var> be the result.</p></li>
<li><p>Let <var title="">timeout</var> be the second argument to
@@ -80864,15 +80853,19 @@
</ol>
+ <hr>
+
<p>The <dfn
+ title="dom-windowtimers-clearTimeout"><code>clearTimeout()</code></dfn>
+ and <dfn
title="dom-windowtimers-clearInterval"><code>clearInterval()</code></dfn>
- method must clear the entry identified as <var title="">handle</var>
- from the <span>list of active intervals</span> of the
+ methods must clear the entry identified as <var
+ title="">handle</var> from the <span>list of active timers</span> of
+ the <code>WindowTimers</code> object on which the method was
+ invoked, where <var title="">handle</var> is the argument passed to
+ the method, if any. (If <var title="">handle</var> does not identify
+ an entry in the <span>list of active timers</span> of the
<code>WindowTimers</code> object on which the method was invoked,
- where <var title="">handle</var> is the argument passed to the
- method, if any. (If <var title="">handle</var> does not identify an
- entry in the <span>list of active intervals</span> of the
- <code>WindowTimers</code> object on which the method was invoked,
the method does nothing.)</p>
<hr>
@@ -87764,7 +87757,7 @@
<li>
<p>Empty the <var title="">worker global scope</var>'s <span>list
- of active timeouts</span> and its <span>list of active
+ of active timers</span> and its <span>list of active
intervals</span>.</p>
</li>