11 files changed, 8 insertions, 10 deletions
diff --git a/components/script/dom/webidls/HTMLDListElement.webidl b/components/script/dom/webidls/HTMLDListElement.webidl
index e0420cf8418..b6275107db5 100644
--- a/components/script/dom/webidls/HTMLDListElement.webidl
+++ b/components/script/dom/webidls/HTMLDListElement.webidl
@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#htmldlistelement
-[Exposed=(Window,Worker)]
 interface HTMLDListElement : HTMLElement {
   // also has obsolete members
 };
diff --git a/components/script/dom/webidls/HTMLDetailsElement.webidl b/components/script/dom/webidls/HTMLDetailsElement.webidl
index 8dbffdea064..811465c1c02 100644
--- a/components/script/dom/webidls/HTMLDetailsElement.webidl
+++ b/components/script/dom/webidls/HTMLDetailsElement.webidl
@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#htmldetailselement
-[Exposed=(Window,Worker)]
 interface HTMLDetailsElement : HTMLElement {
     attribute boolean open;
 };
diff --git a/components/script/dom/webidls/HTMLDialogElement.webidl b/components/script/dom/webidls/HTMLDialogElement.webidl
index 82d11ea2cae..78a14e1e2a0 100644
--- a/components/script/dom/webidls/HTMLDialogElement.webidl
+++ b/components/script/dom/webidls/HTMLDialogElement.webidl
@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#htmldialogelement
-[Exposed=(Window,Worker)]
 interface HTMLDialogElement : HTMLElement {
   attribute boolean open;
   attribute DOMString returnValue;
diff --git a/components/script/dom/webidls/HTMLDirectoryElement.webidl b/components/script/dom/webidls/HTMLDirectoryElement.webidl
index 4a1d8af74ab..5df65cd90c2 100644
--- a/components/script/dom/webidls/HTMLDirectoryElement.webidl
+++ b/components/script/dom/webidls/HTMLDirectoryElement.webidl
@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#htmldirectoryelement
-[Exposed=(Window,Worker)]
 interface HTMLDirectoryElement : HTMLElement {
   //         attribute boolean compact;
 };
diff --git a/components/script/dom/webidls/HTMLDivElement.webidl b/components/script/dom/webidls/HTMLDivElement.webidl
index 827dfe7ab49..46ee67ee0e5 100644
--- a/components/script/dom/webidls/HTMLDivElement.webidl
+++ b/components/script/dom/webidls/HTMLDivElement.webidl
@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#htmldivelement
-[Exposed=(Window,Worker)]
 interface HTMLDivElement : HTMLElement {
   // also has obsolete members
 };
diff --git a/components/script/dom/webidls/HTMLEmbedElement.webidl b/components/script/dom/webidls/HTMLEmbedElement.webidl
index 3e4063c9377..26fa4c3ea5a 100644
--- a/components/script/dom/webidls/HTMLEmbedElement.webidl
+++ b/components/script/dom/webidls/HTMLEmbedElement.webidl
@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#htmlembedelement
-[Exposed=(Window,Worker)]
 interface HTMLEmbedElement : HTMLElement {
   //         attribute DOMString src;
   //         attribute DOMString type;
diff --git a/components/script/dom/webidls/HTMLFieldSetElement.webidl b/components/script/dom/webidls/HTMLFieldSetElement.webidl
index 6c05b23f9ae..d041cdd612f 100644
--- a/components/script/dom/webidls/HTMLFieldSetElement.webidl
+++ b/components/script/dom/webidls/HTMLFieldSetElement.webidl
@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#htmlfieldsetelement
-[Exposed=(Window,Worker)]
 interface HTMLFieldSetElement : HTMLElement {
            attribute boolean disabled;
   readonly attribute HTMLFormElement? form;
diff --git a/components/script/dom/webidls/HTMLFontElement.webidl b/components/script/dom/webidls/HTMLFontElement.webidl
index 7c524eb0a4d..74db3f45057 100644
--- a/components/script/dom/webidls/HTMLFontElement.webidl
+++ b/components/script/dom/webidls/HTMLFontElement.webidl
@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#htmlfontelement
-[Exposed=(Window,Worker)]
 interface HTMLFontElement : HTMLElement {
   [TreatNullAs=EmptyString] attribute DOMString color;
   attribute DOMString face;
diff --git a/components/script/dom/webidls/HTMLFrameElement.webidl b/components/script/dom/webidls/HTMLFrameElement.webidl
index 0de80f7df1e..ecac61f6860 100644
--- a/components/script/dom/webidls/HTMLFrameElement.webidl
+++ b/components/script/dom/webidls/HTMLFrameElement.webidl
@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#htmlframeelement
-[Exposed=(Window,Worker)]
 interface HTMLFrameElement : HTMLElement {
   //         attribute DOMString name;
   //         attribute DOMString scrolling;
diff --git a/components/script/dom/webidls/HTMLFrameSetElement.webidl b/components/script/dom/webidls/HTMLFrameSetElement.webidl
index 34ab7a42289..5addd41d253 100644
--- a/components/script/dom/webidls/HTMLFrameSetElement.webidl
+++ b/components/script/dom/webidls/HTMLFrameSetElement.webidl
@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#htmlframesetelement
-[Exposed=(Window,Worker)]
 interface HTMLFrameSetElement : HTMLElement {
   //         attribute DOMString cols;
   //         attribute DOMString rows;
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs
index 1a34096f26b..3b3652040e9 100644
--- a/components/script/dom/websocket.rs
+++ b/components/script/dom/websocket.rs
@@ -461,6 +461,8 @@ struct ConnectionEstablishedTask {
 }
 
 impl Runnable for ConnectionEstablishedTask {
+    fn name(&self) -> &'static str { "ConnectionEstablishedTask" }
+
     fn handler(self: Box<Self>) {
         let ws = self.address.root();
         let global = ws.r().global();
@@ -510,6 +512,8 @@ impl Runnable for BufferedAmountTask {
     // To be compliant with standards, we need to reset bufferedAmount only when the event loop
     // reaches step 1.  In our implementation, the bytes will already have been sent on a background
     // thread.
+    fn name(&self) -> &'static str { "BufferedAmountTask" }
+
     fn handler(self: Box<Self>) {
         let ws = self.address.root();
 
@@ -526,6 +530,8 @@ struct CloseTask {
 }
 
 impl Runnable for CloseTask {
+    fn name(&self) -> &'static str { "CloseTask" }
+
     fn handler(self: Box<Self>) {
         let ws = self.address.root();
         let ws = ws.r();
@@ -568,6 +574,8 @@ struct MessageReceivedTask {
 }
 
 impl Runnable for MessageReceivedTask {
+    fn name(&self) -> &'static str { "MessageReceivedTask" }
+
     #[allow(unsafe_code)]
     fn handler(self: Box<Self>) {
         let ws = self.address.root();