Expose Worker interfaces only to Worker

See #12415.

6 files changed, 7 insertions, 18 deletions

diff --git a/components/script/dom/webidls/ServiceWorkerGlobalScope.webidl b/components/script/dom/webidls/ServiceWorkerGlobalScope.webidl
index cbe028c129b..35e4b98f9d5 100644
--- a/components/script/dom/webidls/ServiceWorkerGlobalScope.webidl
+++ b/components/script/dom/webidls/ServiceWorkerGlobalScope.webidl
@@ -4,7 +4,8 @@
 
 // https://slightlyoff.github.io/ServiceWorker/spec/service_worker/#service-worker-global-scope
 
-[Global=(Worker,ServiceWorker), Pref="dom.serviceworker.enabled"]
+[Global=(Worker,ServiceWorker), Exposed=ServiceWorker,
+ Pref="dom.serviceworker.enabled"]
 interface ServiceWorkerGlobalScope : WorkerGlobalScope {
   // A container for a list of Client objects that correspond to
   // browsing contexts (or shared workers) that are on the origin of this SW
diff --git a/components/script/dom/webidls/WorkerGlobalScope.webidl b/components/script/dom/webidls/WorkerGlobalScope.webidl
index 0a269068b57..ec65bcb09a6 100644
--- a/components/script/dom/webidls/WorkerGlobalScope.webidl
+++ b/components/script/dom/webidls/WorkerGlobalScope.webidl
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#workerglobalscope
-[Abstract, Exposed=(Window,Worker)]
+[Abstract, Exposed=Worker]
 interface WorkerGlobalScope : EventTarget {
   [BinaryName="Self_"] readonly attribute WorkerGlobalScope self;
   readonly attribute WorkerLocation location;
@@ -16,7 +16,7 @@ interface WorkerGlobalScope : EventTarget {
 };
 
 // https://html.spec.whatwg.org/multipage/#WorkerGlobalScope-partial
-[Exposed=(Window,Worker)]
+[Exposed=Worker]
 partial interface WorkerGlobalScope { // not obsolete
   [Throws]
   void importScripts(DOMString... urls);
@@ -26,7 +26,7 @@ WorkerGlobalScope implements WindowTimers;
 WorkerGlobalScope implements WindowBase64;
 
 // Proprietary
-[Exposed=(Window,Worker)]
+[Exposed=Worker]
 partial interface WorkerGlobalScope {
   [Replaceable]
   readonly attribute Console console;
diff --git a/components/script/dom/webidls/WorkerLocation.webidl b/components/script/dom/webidls/WorkerLocation.webidl
index 797956aca26..e4c410f720a 100644
--- a/components/script/dom/webidls/WorkerLocation.webidl
+++ b/components/script/dom/webidls/WorkerLocation.webidl
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#worker-locations
-[Exposed=(Window,Worker)]
+[Exposed=Worker]
 interface WorkerLocation {
   /*stringifier*/ readonly attribute USVString href;
   // readonly attribute USVString origin;
diff --git a/components/script/dom/webidls/WorkerNavigator.webidl b/components/script/dom/webidls/WorkerNavigator.webidl
index 04006714a0c..0661325b8be 100644
--- a/components/script/dom/webidls/WorkerNavigator.webidl
+++ b/components/script/dom/webidls/WorkerNavigator.webidl
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#workernavigator
-[Exposed=(Window,Worker)]
+[Exposed=Worker]
 interface WorkerNavigator {};
 WorkerNavigator implements NavigatorID;
 WorkerNavigator implements NavigatorLanguage;
diff --git a/tests/wpt/metadata/html/dom/interfaces.html.ini b/tests/wpt/metadata/html/dom/interfaces.html.ini
index 19e4415913e..63aaf524f22 100644
--- a/tests/wpt/metadata/html/dom/interfaces.html.ini
+++ b/tests/wpt/metadata/html/dom/interfaces.html.ini
@@ -9675,12 +9675,3 @@
   [Event interface: calling initEvent(DOMString,boolean,boolean) on new TrackEvent("addtrack", {track:document.createElement("track").track}) with too few arguments must throw TypeError]
     expected: FAIL
 
-  [WorkerGlobalScope interface: existence and properties of interface object]
-    expected: FAIL
-
-  [WorkerNavigator interface: existence and properties of interface object]
-    expected: FAIL
-
-  [WorkerLocation interface: existence and properties of interface object]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/tests/mozilla/interfaces.html b/tests/wpt/mozilla/tests/mozilla/interfaces.html
index 245b8963737..f33834c4908 100644
--- a/tests/wpt/mozilla/tests/mozilla/interfaces.html
+++ b/tests/wpt/mozilla/tests/mozilla/interfaces.html
@@ -176,9 +176,6 @@ test_interfaces([
   "WebSocket",
   "Window",
   "Worker",
-  "WorkerGlobalScope", // #2823
-  "WorkerLocation", // #2823
-  "WorkerNavigator", // #2823
   "XMLDocument",
   "XMLHttpRequest",
   "XMLHttpRequestEventTarget",