- From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 24 Oct 2011 23:19:33 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv27244
Modified Files:
Overview.html
Log Message:
Compatibility. http://software.hixie.ch/utilities/js/live-dom-viewer/saved/1228 (whatwg r6737)
Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.5402
retrieving revision 1.5403
diff -u -d -r1.5402 -r1.5403
--- Overview.html 24 Oct 2011 23:08:55 -0000 1.5402
+++ Overview.html 24 Oct 2011 23:19:29 -0000 1.5403
@@ -51095,11 +51095,11 @@
and <code title="dom-windowtimers-setInterval"><a href="#dom-windowtimers-setinterval">setInterval()</a></code>
methods allow authors to schedule timer-based callbacks.<pre class="idl">[NoInterfaceObject]
interface <dfn id="windowtimers">WindowTimers</dfn> {
- long <a href="#dom-windowtimers-settimeout" title="dom-windowtimers-setTimeout">setTimeout</a>(Function handler, optional float timeout, any... args);
- long <a href="#dom-windowtimers-settimeout" title="dom-windowtimers-setTimeout">setTimeout</a>([AllowAny] DOMString handler, optional float timeout, any... args);
+ long <a href="#dom-windowtimers-settimeout" title="dom-windowtimers-setTimeout">setTimeout</a>(Function handler, optional long timeout, any... args);
+ long <a href="#dom-windowtimers-settimeout" title="dom-windowtimers-setTimeout">setTimeout</a>([AllowAny] DOMString handler, optional long timeout, any... args);
void <a href="#dom-windowtimers-cleartimeout" title="dom-windowtimers-clearTimeout">clearTimeout</a>(long handle);
- long <a href="#dom-windowtimers-setinterval" title="dom-windowtimers-setInterval">setInterval</a>(Function handler, optional float timeout, any... args);
- long <a href="#dom-windowtimers-setinterval" title="dom-windowtimers-setInterval">setInterval</a>([AllowAny] DOMString handler, optional float timeout, any... args);
+ long <a href="#dom-windowtimers-setinterval" title="dom-windowtimers-setInterval">setInterval</a>(Function handler, optional long timeout, any... args);
+ long <a href="#dom-windowtimers-setinterval" title="dom-windowtimers-setInterval">setInterval</a>([AllowAny] DOMString handler, optional long timeout, any... args);
void <a href="#dom-windowtimers-clearinterval" title="dom-windowtimers-clearInterval">clearInterval</a>(long handle);
};
<a href="#window">Window</a> implements <a href="#windowtimers">WindowTimers</a>;</pre><dl class="domintro"><dt><var title="">handle</var> = <var title="">window</var> . <code title="dom-windowtimers-setTimeout"><a href="#dom-windowtimers-settimeout">setTimeout</a></code>( <var title="">handler</var> [, <var title="">timeout</var> [, <var title="">arguments</var>... ] ] )</dt>
@@ -51186,7 +51186,8 @@
<li><p><a href="#get-the-timed-task">Get the timed task</a> <var title="">handle</var> in
the <a href="#list-of-active-timeouts">list of active timeouts</a>, and let <var title="">task</var> be the result.</li>
- <li><p><a href="#get-the-timeout">Get the timeout</a>, and let <var title="">timeout</var> be the result.</li>
+ <li><p>Let <var title="">timeout</var> be the second argument to
+ the method, or zero if the argument was omitted.</li>
<li><p>If the currently running <a href="#concept-task" title="concept-task">task</a> is a task that was created by the
<code title="dom-windowtimers-setTimeout"><a href="#dom-windowtimers-settimeout">setTimeout()</a></code>
@@ -51282,7 +51283,8 @@
<li><p><a href="#get-the-timed-task">Get the timed task</a> <var title="">handle</var> in
the <a href="#list-of-active-intervals">list of active intervals</a>, and let <var title="">task</var> be the result.</li>
- <li><p><a href="#get-the-timeout">Get the timeout</a>, and let <var title="">timeout</var> be the result.</li>
+ <li><p>Let <var title="">timeout</var> be the second argument to
+ the method, or zero if the argument was omitted.</li>
<li><p>If <var title="">timeout</var> is less than 4, then
increase <var title="">timeout</var> to 4.</li>
@@ -51406,21 +51408,6 @@
if the entry for <var title="">handle</var> in <var title="">list</var> has been cleared, and if it has not, <a href="#create-a-script" title="create a script">creates a script</a> using <var title="">script source</var> as the script source, <var title="">scripting language</var> as the scripting language, <var title="">global object</var> as the global object, <var title="">browsing context</var> as the browsing context, <var title="">document</var> as the document, <var title="">character
encoding</var> as the URL character encoding, and <var title="">base URL</var> as the base URL.</li>
- </ol><p>When the above methods are to <dfn id="get-the-timeout">get the timeout</dfn>, they
- must run the following steps:</p>
-
- <ol><li><p>Let <var title="">timeout</var> be the second argument to
- the method, or zero if the argument was omitted.</li>
-
- <li><p>If <var title="">timeout</var> is an Infinity value, a
- Not-a-Number (NaN) value, or negative, let <var title="">timeout</var> be zero.</li>
-
- <li><p>Round <var title="">timeout</var> down to the nearest
- integer, and let <var title="">timeout</var> be the
- result.</li>
-
- <li><p>Return <var title="">timeout</var>.</li>
-
</ol><hr><p>The <a href="#task-source">task source</a> for these <a href="#concept-task" title="concept-task">tasks</a> is the <dfn id="timer-task-source">timer task
source</dfn>.</p>
Received on Monday, 24 October 2011 23:19:40 UTC