[e] (0) Clean up some IDL and be more consistent with Web IDL.

Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=17612 Affected topics: HTML git-svn-id: http://svn.whatwg.org/webapps@7301 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Aug 30, 2012 · 074d2a8 · 074d2a8
1 parent 2e5e110
commit 074d2a8
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 46 deletions.
diff --git a/complete.html b/complete.html
@@ -75709,16 +75709,14 @@ <h3 id=timers><span class=secno>7.3 </span>Timers</h3>
 
   <pre class=idl>[NoInterfaceObject]
 interface <dfn id=windowtimers>WindowTimers</dfn> {
-  long <a href=#dom-windowtimers-settimeout title=dom-windowtimers-setTimeout>setTimeout</a>(<a href=#arbitrarycallback>ArbitraryCallback</a> handler, optional long timeout, any... args);
-  long <a href=#dom-windowtimers-settimeout title=dom-windowtimers-setTimeout>setTimeout</a>(DOMString handler, optional long timeout, any... args);
+  long <a href=#dom-windowtimers-settimeout title=dom-windowtimers-setTimeout>setTimeout</a>(<span>Function</span> handler, optional long timeout, any... arguments);
+  long <a href=#dom-windowtimers-settimeout title=dom-windowtimers-setTimeout>setTimeout</a>(DOMString handler, optional long timeout, any... arguments);
   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>(<a href=#arbitrarycallback>ArbitraryCallback</a> handler, optional long timeout, any... args);
-  long <a href=#dom-windowtimers-setinterval title=dom-windowtimers-setInterval>setInterval</a>(DOMString handler, optional long timeout, any... args);
+  long <a href=#dom-windowtimers-setinterval title=dom-windowtimers-setInterval>setInterval</a>(<span>Function</span> handler, optional long timeout, any... arguments);
+  long <a href=#dom-windowtimers-setinterval title=dom-windowtimers-setInterval>setInterval</a>(DOMString handler, optional long timeout, any... arguments);
   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>;
-
-[TreatNonCallableAsNull] callback <dfn id=arbitrarycallback>ArbitraryCallback</dfn> = any (any... args);</pre>
+<a href=#window>Window</a> implements <a href=#windowtimers>WindowTimers</a>;</pre>
 
   <!-- Demonstrating the need for wrapping of the timeout argument value treated as long rather than clamping or treating as double:
           http://software.hixie.ch/utilities/js/live-dom-viewer/saved/1228
@@ -75809,7 +75807,7 @@ <h3 id=timers><span class=secno>7.3 </span>Timers</h3>
    <li><p><a href=#get-the-timed-task>Get the timed task</a> <var title="">handle</var>
    in the <a href=#list-of-active-timers>list of active timers</a>, and let <var title="">task</var> be the result. This algorithm uses the first
    argument to the method (<var title="">handler</var>) and, if there
-   are any, the third and subsequent arguments to the method (<var title="">args</var>), to establish precisely what <var title="">task</var> does.</li>
+   are any, the third and subsequent arguments to the method (<var title="">arguments</var>), to establish precisely what <var title="">task</var> does.</li>
 
    <li><p>Let <var title="">timeout</var> be the second argument to
    the method, or zero if the argument was omitted.</li>
@@ -75910,7 +75908,7 @@ <h3 id=timers><span class=secno>7.3 </span>Timers</h3>
    <li><p><a href=#get-the-timed-task>Get the timed task</a> <var title="">handle</var>
    in the <a href=#list-of-active-timers>list of active timers</a>, and let <var title="">task</var> be the result. This algorithm uses the first
    argument to the method (<var title="">handler</var>) and, if there
-   are any, the third and subsequent arguments to the method (<var title="">args</var>), to establish precisely what <var title="">task</var> does.</li>
+   are any, the third and subsequent arguments to the method (<var title="">arguments</var>), to establish precisely what <var title="">task</var> does.</li>
 
    <li><p>Let <var title="">timeout</var> be the second argument to
    the method, or zero if the argument was omitted.</li>
@@ -75983,12 +75981,12 @@ <h3 id=timers><span class=secno>7.3 </span>Timers</h3>
 
   <ol><li>
 
-    <p>If the first argument to the invoked method is an
-    <code><a href=#arbitrarycallback>ArbitraryCallback</a></code>, then return a <a href=#concept-task title=concept-task>task</a> that checks if the entry for <var title="">handle</var> in <var title="">list</var> has been
-    cleared, and if it has not, calls the
-    <code><a href=#arbitrarycallback>ArbitraryCallback</a></code> with as its arguments the third and
-    subsequent arguments to the invoked method (if any) and with an
-    undefined <var title="">thisArg</var>, and abort these steps. <a href=#refsECMA262>[ECMA262]</a></p>
+    <p>If the first argument to the invoked method is a
+    <code>Function</code>, then return a <a href=#concept-task title=concept-task>task</a> that checks if the entry for <var title="">handle</var> in <var title="">list</var> has been
+    cleared, and if it has not, calls the <code>Function</code> with
+    as its arguments the third and subsequent arguments to the invoked
+    method (if any) and with an undefined <var title="">thisArg</var>,
+    and abort these steps. <a href=#refsECMA262>[ECMA262]</a></p>
 
     <p class=note>Setting <var title="">thisArg</var> to undefined
     means that the function code will be executed with the <code title="">this</code> keyword bound to the <code><a href=#windowproxy>WindowProxy</a></code>

diff --git a/index b/index
@@ -75709,16 +75709,14 @@ interface <dfn id=windowbase64>WindowBase64</dfn> {
 
   <pre class=idl>[NoInterfaceObject]
 interface <dfn id=windowtimers>WindowTimers</dfn> {
-  long <a href=#dom-windowtimers-settimeout title=dom-windowtimers-setTimeout>setTimeout</a>(<a href=#arbitrarycallback>ArbitraryCallback</a> handler, optional long timeout, any... args);
-  long <a href=#dom-windowtimers-settimeout title=dom-windowtimers-setTimeout>setTimeout</a>(DOMString handler, optional long timeout, any... args);
+  long <a href=#dom-windowtimers-settimeout title=dom-windowtimers-setTimeout>setTimeout</a>(<span>Function</span> handler, optional long timeout, any... arguments);
+  long <a href=#dom-windowtimers-settimeout title=dom-windowtimers-setTimeout>setTimeout</a>(DOMString handler, optional long timeout, any... arguments);
   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>(<a href=#arbitrarycallback>ArbitraryCallback</a> handler, optional long timeout, any... args);
-  long <a href=#dom-windowtimers-setinterval title=dom-windowtimers-setInterval>setInterval</a>(DOMString handler, optional long timeout, any... args);
+  long <a href=#dom-windowtimers-setinterval title=dom-windowtimers-setInterval>setInterval</a>(<span>Function</span> handler, optional long timeout, any... arguments);
+  long <a href=#dom-windowtimers-setinterval title=dom-windowtimers-setInterval>setInterval</a>(DOMString handler, optional long timeout, any... arguments);
   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>;
-
-[TreatNonCallableAsNull] callback <dfn id=arbitrarycallback>ArbitraryCallback</dfn> = any (any... args);</pre>
+<a href=#window>Window</a> implements <a href=#windowtimers>WindowTimers</a>;</pre>
 
   <!-- Demonstrating the need for wrapping of the timeout argument value treated as long rather than clamping or treating as double:
           http://software.hixie.ch/utilities/js/live-dom-viewer/saved/1228
@@ -75809,7 +75807,7 @@ interface <dfn id=windowtimers>WindowTimers</dfn> {
    <li><p><a href=#get-the-timed-task>Get the timed task</a> <var title="">handle</var>
    in the <a href=#list-of-active-timers>list of active timers</a>, and let <var title="">task</var> be the result. This algorithm uses the first
    argument to the method (<var title="">handler</var>) and, if there
-   are any, the third and subsequent arguments to the method (<var title="">args</var>), to establish precisely what <var title="">task</var> does.</li>
+   are any, the third and subsequent arguments to the method (<var title="">arguments</var>), to establish precisely what <var title="">task</var> does.</li>
 
    <li><p>Let <var title="">timeout</var> be the second argument to
    the method, or zero if the argument was omitted.</li>
@@ -75910,7 +75908,7 @@ setTimeout({ toString: function () {
    <li><p><a href=#get-the-timed-task>Get the timed task</a> <var title="">handle</var>
    in the <a href=#list-of-active-timers>list of active timers</a>, and let <var title="">task</var> be the result. This algorithm uses the first
    argument to the method (<var title="">handler</var>) and, if there
-   are any, the third and subsequent arguments to the method (<var title="">args</var>), to establish precisely what <var title="">task</var> does.</li>
+   are any, the third and subsequent arguments to the method (<var title="">arguments</var>), to establish precisely what <var title="">task</var> does.</li>
 
    <li><p>Let <var title="">timeout</var> be the second argument to
    the method, or zero if the argument was omitted.</li>
@@ -75983,12 +75981,12 @@ setTimeout({ toString: function () {
 
   <ol><li>
 
-    <p>If the first argument to the invoked method is an
-    <code><a href=#arbitrarycallback>ArbitraryCallback</a></code>, then return a <a href=#concept-task title=concept-task>task</a> that checks if the entry for <var title="">handle</var> in <var title="">list</var> has been
-    cleared, and if it has not, calls the
-    <code><a href=#arbitrarycallback>ArbitraryCallback</a></code> with as its arguments the third and
-    subsequent arguments to the invoked method (if any) and with an
-    undefined <var title="">thisArg</var>, and abort these steps. <a href=#refsECMA262>[ECMA262]</a></p>
+    <p>If the first argument to the invoked method is a
+    <code>Function</code>, then return a <a href=#concept-task title=concept-task>task</a> that checks if the entry for <var title="">handle</var> in <var title="">list</var> has been
+    cleared, and if it has not, calls the <code>Function</code> with
+    as its arguments the third and subsequent arguments to the invoked
+    method (if any) and with an undefined <var title="">thisArg</var>,
+    and abort these steps. <a href=#refsECMA262>[ECMA262]</a></p>
 
     <p class=note>Setting <var title="">thisArg</var> to undefined
     means that the function code will be executed with the <code title="">this</code> keyword bound to the <code><a href=#windowproxy>WindowProxy</a></code>

diff --git a/source b/source
@@ -88515,16 +88515,14 @@ interface <dfn>WindowBase64</dfn> {
 
   <pre class="idl">[NoInterfaceObject]
 interface <dfn>WindowTimers</dfn> {
-  long <span title="dom-windowtimers-setTimeout">setTimeout</span>(<span>ArbitraryCallback</span> handler, optional long timeout, any... args);
-  long <span title="dom-windowtimers-setTimeout">setTimeout</span>(DOMString handler, optional long timeout, any... args);
+  long <span title="dom-windowtimers-setTimeout">setTimeout</span>(<span>Function</span> handler, optional long timeout, any... arguments);
+  long <span title="dom-windowtimers-setTimeout">setTimeout</span>(DOMString handler, optional long timeout, any... arguments);
   void <span title="dom-windowtimers-clearTimeout">clearTimeout</span>(long handle);
-  long <span title="dom-windowtimers-setInterval">setInterval</span>(<span>ArbitraryCallback</span> handler, optional long timeout, any... args);
-  long <span title="dom-windowtimers-setInterval">setInterval</span>(DOMString handler, optional long timeout, any... args);
+  long <span title="dom-windowtimers-setInterval">setInterval</span>(<span>Function</span> handler, optional long timeout, any... arguments);
+  long <span title="dom-windowtimers-setInterval">setInterval</span>(DOMString handler, optional long timeout, any... arguments);
   void <span title="dom-windowtimers-clearInterval">clearInterval</span>(long handle);
 };
-<span>Window</span> implements <span>WindowTimers</span>;
-
-[TreatNonCallableAsNull] callback <dfn>ArbitraryCallback</dfn> = any (any... args);</pre>
+<span>Window</span> implements <span>WindowTimers</span>;</pre>
 
   <!-- Demonstrating the need for wrapping of the timeout argument value treated as long rather than clamping or treating as double:
           http://software.hixie.ch/utilities/js/live-dom-viewer/saved/1228
@@ -88633,7 +88631,7 @@ interface <dfn>WindowTimers</dfn> {
    title="">task</var> be the result. This algorithm uses the first
    argument to the method (<var title="">handler</var>) and, if there
    are any, the third and subsequent arguments to the method (<var
-   title="">args</var>), to establish precisely what <var
+   title="">arguments</var>), to establish precisely what <var
    title="">task</var> does.</p></li>
 
    <li><p>Let <var title="">timeout</var> be the second argument to
@@ -88748,7 +88746,7 @@ setTimeout({ toString: function () {
    title="">task</var> be the result. This algorithm uses the first
    argument to the method (<var title="">handler</var>) and, if there
    are any, the third and subsequent arguments to the method (<var
-   title="">args</var>), to establish precisely what <var
+   title="">arguments</var>), to establish precisely what <var
    title="">task</var> does.</p></li>
 
    <li><p>Let <var title="">timeout</var> be the second argument to
@@ -88836,15 +88834,14 @@ setTimeout({ toString: function () {
 
    <li>
 
-    <p>If the first argument to the invoked method is an
-    <code>ArbitraryCallback</code>, then return a <span
+    <p>If the first argument to the invoked method is a
+    <code>Function</code>, then return a <span
     title="concept-task">task</span> that checks if the entry for <var
     title="">handle</var> in <var title="">list</var> has been
-    cleared, and if it has not, calls the
-    <code>ArbitraryCallback</code> with as its arguments the third and
-    subsequent arguments to the invoked method (if any) and with an
-    undefined <var title="">thisArg</var>, and abort these steps. <a
-    href="#refsECMA262">[ECMA262]</a></p>
+    cleared, and if it has not, calls the <code>Function</code> with
+    as its arguments the third and subsequent arguments to the invoked
+    method (if any) and with an undefined <var title="">thisArg</var>,
+    and abort these steps. <a href="#refsECMA262">[ECMA262]</a></p>
 
     <p class="note">Setting <var title="">thisArg</var> to undefined
     means that the function code will be executed with the <code