[e] (0) Defer to WebIDL more.

Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=12870 git-svn-id: http://svn.whatwg.org/webapps@6399 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Aug 10, 2011 · 5a5fdd2 · 5a5fdd2
1 parent d8242b4
commit 5a5fdd2
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 52 deletions.
diff --git a/complete.html b/complete.html
@@ -69070,9 +69070,11 @@ <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>(in any handler, in optional any timeout, in any... args);
+  long <a href=#dom-windowtimers-settimeout title=dom-windowtimers-setTimeout>setTimeout</a>(in Function handler, in optional float timeout, in any... args);
+  long <a href=#dom-windowtimers-settimeout title=dom-windowtimers-setTimeout>setTimeout</a>([AllowAny] in DOMString handler, in optional float timeout, in any... args);
   void <a href=#dom-windowtimers-cleartimeout title=dom-windowtimers-clearTimeout>clearTimeout</a>(in long handle);
-  long <a href=#dom-windowtimers-setinterval title=dom-windowtimers-setInterval>setInterval</a>(in any handler, in optional any timeout, in any... args);
+  long <a href=#dom-windowtimers-setinterval title=dom-windowtimers-setInterval>setInterval</a>(in Function handler, in optional float timeout, in any... args);
+  long <a href=#dom-windowtimers-setinterval title=dom-windowtimers-setInterval>setInterval</a>([AllowAny] in DOMString handler, in optional float timeout, in any... args);
   void <a href=#dom-windowtimers-clearinterval title=dom-windowtimers-clearInterval>clearInterval</a>(in long handle);
 };
 <a href=#window>Window</a> implements <a href=#windowtimers>WindowTimers</a>;</pre>
@@ -69302,11 +69304,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 object that
-    has an internal [[Call]] method, 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 aforementioned [[Call]]
-    method 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><a href=#function>Function</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=#function>Function</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 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>
@@ -69317,9 +69320,8 @@ <h3 id=timers><span class=secno>7.3 </span>Timers</h3>
 
    </li>
 
-   <li><p>Apply the ToString() abstract operation to the first
-   argument to the method, and let <var title="">script source</var>
-   be the result. <a href=#refsECMA262>[ECMA262]</a></li>
+   <li><p>Let <var title="">script source</var> be the first argument
+   to the method.</li>
 
    <li><p>Let <var title="">script language</var> be
    JavaScript.</li>
@@ -69366,12 +69368,6 @@ <h3 id=timers><span class=secno>7.3 </span>Timers</h3>
   <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>Apply the ToString() abstract operation to <var title="">timeout</var>, and let <var title="">timeout</var>
-   be the result. <a href=#refsECMA262>[ECMA262]</a></li>
-
-   <li><p>Apply the ToNumber() abstract operation to <var title="">timeout</var>, and let <var title="">timeout</var> be the
-   result. <a href=#refsECMA262>[ECMA262]</a></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>
 

diff --git a/index b/index
@@ -68957,9 +68957,11 @@ 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>(in any handler, in optional any timeout, in any... args);
+  long <a href=#dom-windowtimers-settimeout title=dom-windowtimers-setTimeout>setTimeout</a>(in Function handler, in optional float timeout, in any... args);
+  long <a href=#dom-windowtimers-settimeout title=dom-windowtimers-setTimeout>setTimeout</a>([AllowAny] in DOMString handler, in optional float timeout, in any... args);
   void <a href=#dom-windowtimers-cleartimeout title=dom-windowtimers-clearTimeout>clearTimeout</a>(in long handle);
-  long <a href=#dom-windowtimers-setinterval title=dom-windowtimers-setInterval>setInterval</a>(in any handler, in optional any timeout, in any... args);
+  long <a href=#dom-windowtimers-setinterval title=dom-windowtimers-setInterval>setInterval</a>(in Function handler, in optional float timeout, in any... args);
+  long <a href=#dom-windowtimers-setinterval title=dom-windowtimers-setInterval>setInterval</a>([AllowAny] in DOMString handler, in optional float timeout, in any... args);
   void <a href=#dom-windowtimers-clearinterval title=dom-windowtimers-clearInterval>clearInterval</a>(in long handle);
 };
 <a href=#window>Window</a> implements <a href=#windowtimers>WindowTimers</a>;</pre>
@@ -69192,11 +69194,12 @@ interface <dfn id=windowtimers>WindowTimers</dfn> {
 
   <ol><li>
 
-    <p>If the first argument to the invoked method is an object that
-    has an internal [[Call]] method, 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 aforementioned [[Call]]
-    method 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><a href=#function>Function</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=#function>Function</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 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>
@@ -69207,9 +69210,8 @@ interface <dfn id=windowtimers>WindowTimers</dfn> {
 
    </li>
 
-   <li><p>Apply the ToString() abstract operation to the first
-   argument to the method, and let <var title="">script source</var>
-   be the result. <a href=#refsECMA262>[ECMA262]</a></li>
+   <li><p>Let <var title="">script source</var> be the first argument
+   to the method.</li>
 
    <li><p>Let <var title="">script language</var> be
    JavaScript.</li>
@@ -69256,12 +69258,6 @@ interface <dfn id=windowtimers>WindowTimers</dfn> {
   <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>Apply the ToString() abstract operation to <var title="">timeout</var>, and let <var title="">timeout</var>
-   be the result. <a href=#refsECMA262>[ECMA262]</a></li>
-
-   <li><p>Apply the ToNumber() abstract operation to <var title="">timeout</var>, and let <var title="">timeout</var> be the
-   result. <a href=#refsECMA262>[ECMA262]</a></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>
 

diff --git a/source b/source
@@ -78601,9 +78601,11 @@ interface <dfn>WindowBase64</dfn> {
 
   <pre class="idl">[NoInterfaceObject]
 interface <dfn>WindowTimers</dfn> {
-  long <span title="dom-windowtimers-setTimeout">setTimeout</span>(in any handler, in optional any timeout, in any... args);
+  long <span title="dom-windowtimers-setTimeout">setTimeout</span>(in Function handler, in optional float timeout, in any... args);
+  long <span title="dom-windowtimers-setTimeout">setTimeout</span>([AllowAny] in DOMString handler, in optional float timeout, in any... args);
   void <span title="dom-windowtimers-clearTimeout">clearTimeout</span>(in long handle);
-  long <span title="dom-windowtimers-setInterval">setInterval</span>(in any handler, in optional any timeout, in any... args);
+  long <span title="dom-windowtimers-setInterval">setInterval</span>(in Function handler, in optional float timeout, in any... args);
+  long <span title="dom-windowtimers-setInterval">setInterval</span>([AllowAny] in DOMString handler, in optional float timeout, in any... args);
   void <span title="dom-windowtimers-clearInterval">clearInterval</span>(in long handle);
 };
 <span>Window</span> implements <span>WindowTimers</span>;</pre>
@@ -78875,15 +78877,14 @@ interface <dfn>WindowTimers</dfn> {
 
    <li>
 
-    <p>If the first argument to the invoked method is an object that
-    has an internal [[Call]] method, 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 aforementioned [[Call]]
-    method 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
@@ -78895,9 +78896,8 @@ interface <dfn>WindowTimers</dfn> {
 
    </li>
 
-   <li><p>Apply the ToString() abstract operation to the first
-   argument to the method, and let <var title="">script source</var>
-   be the result. <a href="#refsECMA262">[ECMA262]</a></p></li>
+   <li><p>Let <var title="">script source</var> be the first argument
+   to the method.</p></li>
 
    <li><p>Let <var title="">script language</var> be
    JavaScript.</p></li>
@@ -78958,14 +78958,6 @@ interface <dfn>WindowTimers</dfn> {
    <li><p>Let <var title="">timeout</var> be the second argument to
    the method, or zero if the argument was omitted.</p></li>
 
-   <li><p>Apply the ToString() abstract operation to <var
-   title="">timeout</var>, and let <var title="">timeout</var>
-   be the result. <a href="#refsECMA262">[ECMA262]</a></p></li>
-
-   <li><p>Apply the ToNumber() abstract operation to <var
-   title="">timeout</var>, and let <var title="">timeout</var> be the
-   result. <a href="#refsECMA262">[ECMA262]</a></p></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.</p></li>