Move around WindowOrWorkerGlobalScope methods

This commit is contained in:
Anthony Ramine 2018-04-27 11:19:07 +02:00
parent d234aeb5af
commit 88a0265c00
3 changed files with 11 additions and 30 deletions

View file

@ -75,28 +75,6 @@ Window implements WindowEventHandlers;
[NoInterfaceObject]
interface WindowProxy {};
// https://html.spec.whatwg.org/multipage/#timers
[NoInterfaceObject, Exposed=(Window,Worker)]
interface WindowTimers {
long setTimeout(Function handler, optional long timeout = 0, any... arguments);
long setTimeout(DOMString handler, optional long timeout = 0, any... arguments);
void clearTimeout(optional long handle = 0);
long setInterval(Function handler, optional long timeout = 0, any... arguments);
long setInterval(DOMString handler, optional long timeout = 0, any... arguments);
void clearInterval(optional long handle = 0);
};
Window implements WindowTimers;
// https://html.spec.whatwg.org/multipage/#atob
[NoInterfaceObject, Exposed=(Window,Worker)]
interface WindowBase64 {
[Throws]
DOMString btoa(DOMString btoa);
[Throws]
DOMString atob(DOMString atob);
};
Window implements WindowBase64;
// https://html.spec.whatwg.org/multipage/#Window-partial
partial interface Window {
void captureEvents();

View file

@ -4,6 +4,7 @@
// https://html.spec.whatwg.org/multipage/#windoworworkerglobalscope
// FIXME(nox): https://github.com/servo/servo/issues/20700
// typedef (DOMString or Function) TimerHandler;
[NoInterfaceObject, Exposed=(Window,Worker)]
@ -11,14 +12,18 @@ interface WindowOrWorkerGlobalScope {
// [Replaceable] readonly attribute USVString origin;
// base64 utility methods
// DOMString btoa(DOMString data);
// DOMString atob(DOMString data);
[Throws] DOMString btoa(DOMString data);
[Throws] DOMString atob(DOMString data);
// timers
// long setTimeout(TimerHandler handler, optional long timeout = 0, any... arguments);
// void clearTimeout(optional long handle = 0);
// long setInterval(TimerHandler handler, optional long timeout = 0, any... arguments);
// void clearInterval(optional long handle = 0);
// FIXME(nox): https://github.com/servo/servo/issues/20700
long setTimeout(Function handler, optional long timeout = 0, any... arguments);
long setTimeout(DOMString handler, optional long timeout = 0, any... arguments);
void clearTimeout(optional long handle = 0);
// FIXME(nox): https://github.com/servo/servo/issues/20700
long setInterval(Function handler, optional long timeout = 0, any... arguments);
long setInterval(DOMString handler, optional long timeout = 0, any... arguments);
void clearInterval(optional long handle = 0);
// ImageBitmap
// Promise<ImageBitmap> createImageBitmap(ImageBitmapSource image, optional ImageBitmapOptions options);

View file

@ -22,5 +22,3 @@ partial interface WorkerGlobalScope { // not obsolete
void importScripts(DOMString... urls);
readonly attribute WorkerNavigator navigator;
};
WorkerGlobalScope implements WindowTimers;
WorkerGlobalScope implements WindowBase64;