auto merge of #1890 : Ms2ger/servo/Window-idl, r=jdm

This commit is contained in:
bors-servo 2014-03-13 06:43:39 -04:00
commit a0f527b84f

View file

@ -67,13 +67,13 @@ partial interface Window {
[NoInterfaceObject] [NoInterfaceObject]
interface WindowTimers { interface WindowTimers {
//long setTimeout(Function handler, optional long timeout, any... arguments); //long setTimeout(Function handler, optional long timeout = 0, any... arguments);
//XXXjdm No support for Function or variadic arguments yet //XXXjdm No support for Function or variadic arguments yet
long setTimeout(any handler, optional long timeout/*, any... arguments*/); long setTimeout(any handler, optional long timeout = 0/*, any... arguments*/);
void clearTimeout(long handle); void clearTimeout(optional long handle = 0);
/*long setTimeout(DOMString handler, optional long timeout, any... arguments); /*long setTimeout(DOMString handler, optional long timeout = 0, any... arguments);
long setInterval(Function handler, optional long timeout, any... arguments); long setInterval(Function handler, optional long timeout = 0, any... arguments);
long setInterval(DOMString handler, optional long timeout, any... arguments); long setInterval(DOMString handler, optional long timeout = 0, any... arguments);
void clearInterval(long handle);*/ void clearInterval(optional long handle = 0);*/
}; };
Window implements WindowTimers; Window implements WindowTimers;