From 88a0265c00d9e1c4509a54275709a3c0c7d867b3 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Fri, 27 Apr 2018 11:19:07 +0200
Subject: [PATCH] Move around WindowOrWorkerGlobalScope methods

---
 components/script/dom/webidls/Window.webidl   | 22 -------------------
 .../webidls/WindowOrWorkerGlobalScope.webidl  | 17 +++++++++-----
 .../dom/webidls/WorkerGlobalScope.webidl      |  2 --
 3 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/components/script/dom/webidls/Window.webidl b/components/script/dom/webidls/Window.webidl
index a0eca687386..034684c1744 100644
--- a/components/script/dom/webidls/Window.webidl
+++ b/components/script/dom/webidls/Window.webidl
@@ -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();
diff --git a/components/script/dom/webidls/WindowOrWorkerGlobalScope.webidl b/components/script/dom/webidls/WindowOrWorkerGlobalScope.webidl
index c7dac1de003..bd57b80e20d 100644
--- a/components/script/dom/webidls/WindowOrWorkerGlobalScope.webidl
+++ b/components/script/dom/webidls/WindowOrWorkerGlobalScope.webidl
@@ -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);
diff --git a/components/script/dom/webidls/WorkerGlobalScope.webidl b/components/script/dom/webidls/WorkerGlobalScope.webidl
index dcdd2957d43..7d857fdf6c1 100644
--- a/components/script/dom/webidls/WorkerGlobalScope.webidl
+++ b/components/script/dom/webidls/WorkerGlobalScope.webidl
@@ -22,5 +22,3 @@ partial interface WorkerGlobalScope { // not obsolete
   void importScripts(DOMString... urls);
   readonly attribute WorkerNavigator navigator;
 };
-WorkerGlobalScope implements WindowTimers;
-WorkerGlobalScope implements WindowBase64;