Rename legacy extended attributes in webidls

https://github.com/whatwg/webidl/pull/870

51 files changed, 83 insertions, 83 deletions

diff --git a/components/script/dom/webidls/ANGLEInstancedArrays.webidl b/components/script/dom/webidls/ANGLEInstancedArrays.webidl
index 4ec6cdffc4e..22ef2ee0d0e 100644
--- a/components/script/dom/webidls/ANGLEInstancedArrays.webidl
+++ b/components/script/dom/webidls/ANGLEInstancedArrays.webidl
@@ -6,7 +6,7 @@
  * https://www.khronos.org/registry/webgl/extensions/ANGLE_instanced_arrays/
  */
 
-[NoInterfaceObject, Exposed=Window]
+[LegacyNoInterfaceObject, Exposed=Window]
 interface ANGLEInstancedArrays {
     const GLenum VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE = 0x88FE;
     undefined drawArraysInstancedANGLE(GLenum mode, GLint first, GLsizei count, GLsizei primcount);
diff --git a/components/script/dom/webidls/CSSStyleDeclaration.webidl b/components/script/dom/webidls/CSSStyleDeclaration.webidl
index 1b67ec6a7fa..73ee152a4ac 100644
--- a/components/script/dom/webidls/CSSStyleDeclaration.webidl
+++ b/components/script/dom/webidls/CSSStyleDeclaration.webidl
@@ -17,8 +17,8 @@ interface CSSStyleDeclaration {
   DOMString getPropertyValue(DOMString property);
   DOMString getPropertyPriority(DOMString property);
   [CEReactions, Throws]
-  undefined setProperty(DOMString property, [TreatNullAs=EmptyString] DOMString value,
-                                       optional [TreatNullAs=EmptyString] DOMString priority = "");
+  undefined setProperty(DOMString property, [LegacyNullToEmptyString] DOMString value,
+                                       optional [LegacyNullToEmptyString] DOMString priority = "");
   [CEReactions, Throws]
   DOMString removeProperty(DOMString property);
   // readonly attribute CSSRule? parentRule;
diff --git a/components/script/dom/webidls/CanvasRenderingContext2D.webidl b/components/script/dom/webidls/CanvasRenderingContext2D.webidl
index 2c2cc0a8e5d..436a39a57ee 100644
--- a/components/script/dom/webidls/CanvasRenderingContext2D.webidl
+++ b/components/script/dom/webidls/CanvasRenderingContext2D.webidl
@@ -93,7 +93,7 @@ interface mixin CanvasFillStrokeStyles {
   [Throws]
   CanvasGradient createRadialGradient(double x0, double y0, double r0, double x1, double y1, double r1);
   [Throws]
-  CanvasPattern? createPattern(CanvasImageSource image, [TreatNullAs=EmptyString] DOMString repetition);
+  CanvasPattern? createPattern(CanvasImageSource image, [LegacyNullToEmptyString] DOMString repetition);
 };
 
 [Exposed=(PaintWorklet, Window, Worker)]
diff --git a/components/script/dom/webidls/CharacterData.webidl b/components/script/dom/webidls/CharacterData.webidl
index 34dc42c2db8..3f3d1fda356 100644
--- a/components/script/dom/webidls/CharacterData.webidl
+++ b/components/script/dom/webidls/CharacterData.webidl
@@ -11,7 +11,7 @@
 
 [Exposed=Window, Abstract]
 interface CharacterData : Node {
-  [Pure] attribute [TreatNullAs=EmptyString] DOMString data;
+  [Pure] attribute [LegacyNullToEmptyString] DOMString data;
   [Pure] readonly attribute unsigned long length;
   [Pure, Throws]
   DOMString substringData(unsigned long offset, unsigned long count);
diff --git a/components/script/dom/webidls/DOMImplementation.webidl b/components/script/dom/webidls/DOMImplementation.webidl
index cf809b30f1a..af744e3a08c 100644
--- a/components/script/dom/webidls/DOMImplementation.webidl
+++ b/components/script/dom/webidls/DOMImplementation.webidl
@@ -17,7 +17,7 @@ interface DOMImplementation {
                                   DOMString systemId);
   [NewObject, Throws]
   XMLDocument createDocument(DOMString? namespace,
-                             [TreatNullAs=EmptyString] DOMString qualifiedName,
+                             [LegacyNullToEmptyString] DOMString qualifiedName,
                              optional DocumentType? doctype = null);
   [NewObject]
   Document createHTMLDocument(optional DOMString title);
diff --git a/components/script/dom/webidls/DOMStringMap.webidl b/components/script/dom/webidls/DOMStringMap.webidl
index 39891f24096..1ac525325f7 100644
--- a/components/script/dom/webidls/DOMStringMap.webidl
+++ b/components/script/dom/webidls/DOMStringMap.webidl
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#the-domstringmap-interface
-[Exposed=Window, OverrideBuiltins]
+[Exposed=Window, LegacyOverrideBuiltIns]
 interface DOMStringMap {
   getter DOMString (DOMString name);
   [CEReactions, Throws]
diff --git a/components/script/dom/webidls/DissimilarOriginLocation.webidl b/components/script/dom/webidls/DissimilarOriginLocation.webidl
index 20821e48fc6..e4101bd35e7 100644
--- a/components/script/dom/webidls/DissimilarOriginLocation.webidl
+++ b/components/script/dom/webidls/DissimilarOriginLocation.webidl
@@ -14,7 +14,7 @@
 // way to enforce security policy.
 
 // https://html.spec.whatwg.org/multipage/#location
-[Exposed=(Window,DissimilarOriginWindow), Unforgeable, NoInterfaceObject]
+[Exposed=(Window,DissimilarOriginWindow), LegacyUnforgeable, LegacyNoInterfaceObject]
 interface DissimilarOriginLocation {
   [Throws] attribute USVString href;
   [Throws] undefined assign(USVString url);
diff --git a/components/script/dom/webidls/DissimilarOriginWindow.webidl b/components/script/dom/webidls/DissimilarOriginWindow.webidl
index 755409c7964..0f77aba7d05 100644
--- a/components/script/dom/webidls/DissimilarOriginWindow.webidl
+++ b/components/script/dom/webidls/DissimilarOriginWindow.webidl
@@ -13,15 +13,15 @@
 // way to enforce security policy.
 
 // https://html.spec.whatwg.org/multipage/#window
-[Global, Exposed=(Window,DissimilarOriginWindow), NoInterfaceObject]
+[Global, Exposed=(Window,DissimilarOriginWindow), LegacyNoInterfaceObject]
 interface DissimilarOriginWindow : GlobalScope {
-  [Unforgeable] readonly attribute WindowProxy window;
+  [LegacyUnforgeable] readonly attribute WindowProxy window;
   [BinaryName="Self_", Replaceable] readonly attribute WindowProxy self;
-  [Unforgeable] readonly attribute WindowProxy? parent;
-  [Unforgeable] readonly attribute WindowProxy? top;
+  [LegacyUnforgeable] readonly attribute WindowProxy? parent;
+  [LegacyUnforgeable] readonly attribute WindowProxy? top;
   [Replaceable] readonly attribute WindowProxy frames;
   [Replaceable] readonly attribute unsigned long length;
-  [Unforgeable] readonly attribute DissimilarOriginLocation location;
+  [LegacyUnforgeable] readonly attribute DissimilarOriginLocation location;
 
   undefined close();
   readonly attribute boolean closed;
diff --git a/components/script/dom/webidls/Document.webidl b/components/script/dom/webidls/Document.webidl
index 3f169a35153..e33600dd17b 100644
--- a/components/script/dom/webidls/Document.webidl
+++ b/components/script/dom/webidls/Document.webidl
@@ -84,10 +84,10 @@ dictionary ElementCreationOptions {
 };
 
 // https://html.spec.whatwg.org/multipage/#the-document-object
-// [OverrideBuiltins]
+// [LegacyOverrideBuiltIns]
 partial /*sealed*/ interface Document {
   // resource metadata management
-  [PutForwards=href, Unforgeable]
+  [PutForwards=href, LegacyUnforgeable]
   readonly attribute Location? location;
   [SetterThrows] attribute DOMString domain;
   readonly attribute DOMString referrer;
@@ -146,7 +146,7 @@ partial /*sealed*/ interface Document {
   // DOMString queryCommandValue(DOMString commandId);
 
   // special event handler IDL attributes that only apply to Document objects
-  [LenientThis] attribute EventHandler onreadystatechange;
+  [LegacyLenientThis] attribute EventHandler onreadystatechange;
 
   // also has obsolete members
 };
@@ -156,22 +156,22 @@ Document includes DocumentAndElementEventHandlers;
 // https://html.spec.whatwg.org/multipage/#Document-partial
 partial interface Document {
   [CEReactions]
-  attribute [TreatNullAs=EmptyString] DOMString fgColor;
+  attribute [LegacyNullToEmptyString] DOMString fgColor;
 
   // https://github.com/servo/servo/issues/8715
-  // [CEReactions, TreatNullAs=EmptyString]
+  // [CEReactions, LegacyNullToEmptyString]
   // attribute DOMString linkColor;
 
   // https://github.com/servo/servo/issues/8716
-  // [CEReactions, TreatNullAs=EmptyString]
+  // [CEReactions, LegacyNullToEmptyString]
   // attribute DOMString vlinkColor;
 
   // https://github.com/servo/servo/issues/8717
-  // [CEReactions, TreatNullAs=EmptyString]
+  // [CEReactions, LegacyNullToEmptyString]
   // attribute DOMString alinkColor;
 
   [CEReactions]
-  attribute [TreatNullAs=EmptyString] DOMString bgColor;
+  attribute [LegacyNullToEmptyString] DOMString bgColor;
 
   [SameObject]
   readonly attribute HTMLCollection anchors;
@@ -189,9 +189,9 @@ partial interface Document {
 
 // https://fullscreen.spec.whatwg.org/#api
 partial interface Document {
-  [LenientSetter] readonly attribute boolean fullscreenEnabled;
-  [LenientSetter] readonly attribute Element? fullscreenElement;
-  [LenientSetter] readonly attribute boolean fullscreen; // historical
+  [LegacyLenientSetter] readonly attribute boolean fullscreenEnabled;
+  [LegacyLenientSetter] readonly attribute Element? fullscreenElement;
+  [LegacyLenientSetter] readonly attribute boolean fullscreen; // historical
 
   Promise<undefined> exitFullscreen();
 
diff --git a/components/script/dom/webidls/DynamicModuleOwner.webidl b/components/script/dom/webidls/DynamicModuleOwner.webidl
index 924481d491b..20ad0e3367b 100644
--- a/components/script/dom/webidls/DynamicModuleOwner.webidl
+++ b/components/script/dom/webidls/DynamicModuleOwner.webidl
@@ -7,7 +7,7 @@
  * so that we can hold a traceable owner for those dynamic modules which don't hold a owner.
  */
 
-[NoInterfaceObject, Exposed=Window]
+[LegacyNoInterfaceObject, Exposed=Window]
 interface DynamicModuleOwner {
   readonly attribute Promise<any> promise;
 };
diff --git a/components/script/dom/webidls/EXTBlendMinmax.webidl b/components/script/dom/webidls/EXTBlendMinmax.webidl
index 767eace6923..b9f9f09fe9a 100644
--- a/components/script/dom/webidls/EXTBlendMinmax.webidl
+++ b/components/script/dom/webidls/EXTBlendMinmax.webidl
@@ -6,7 +6,7 @@
  * https://www.khronos.org/registry/webgl/extensions/EXT_blend_minmax/
  */
 
-[NoInterfaceObject, Exposed=Window]
+[LegacyNoInterfaceObject, Exposed=Window]
 interface EXTBlendMinmax {
   const GLenum MIN_EXT = 0x8007;
   const GLenum MAX_EXT = 0x8008;
diff --git a/components/script/dom/webidls/EXTColorBufferHalfFloat.webidl b/components/script/dom/webidls/EXTColorBufferHalfFloat.webidl
index 77cf23c6cd0..0844ec6c328 100644
--- a/components/script/dom/webidls/EXTColorBufferHalfFloat.webidl
+++ b/components/script/dom/webidls/EXTColorBufferHalfFloat.webidl
@@ -6,7 +6,7 @@
  * https://www.khronos.org/registry/webgl/extensions/EXT_color_buffer_half_float/
  */
 
-[NoInterfaceObject, Exposed=Window]
+[LegacyNoInterfaceObject, Exposed=Window]
 interface EXTColorBufferHalfFloat {
   const GLenum RGBA16F_EXT = 0x881A;
   const GLenum RGB16F_EXT = 0x881B;
diff --git a/components/script/dom/webidls/EXTFragDepth.webidl b/components/script/dom/webidls/EXTFragDepth.webidl
index 7fde7896c4c..22c8d25b214 100644
--- a/components/script/dom/webidls/EXTFragDepth.webidl
+++ b/components/script/dom/webidls/EXTFragDepth.webidl
@@ -6,6 +6,6 @@
  * https://www.khronos.org/registry/webgl/extensions/EXT_frag_depth/
  */
 
-[NoInterfaceObject, Exposed=Window]
+[LegacyNoInterfaceObject, Exposed=Window]
 interface EXTFragDepth {
 }; // interface EXT_frag_depth
diff --git a/components/script/dom/webidls/EXTShaderTextureLod.webidl b/components/script/dom/webidls/EXTShaderTextureLod.webidl
index decb5ba86ac..a05370b42b2 100644
--- a/components/script/dom/webidls/EXTShaderTextureLod.webidl
+++ b/components/script/dom/webidls/EXTShaderTextureLod.webidl
@@ -6,6 +6,6 @@
  * https://www.khronos.org/registry/webgl/extensions/EXT_shader_texture_lod/
  */
 
-[NoInterfaceObject, Exposed=Window]
+[LegacyNoInterfaceObject, Exposed=Window]
 interface EXTShaderTextureLod {
 };
diff --git a/components/script/dom/webidls/EXTTextureFilterAnisotropic.webidl b/components/script/dom/webidls/EXTTextureFilterAnisotropic.webidl
index d2957500844..812ae3d8a8b 100644
--- a/components/script/dom/webidls/EXTTextureFilterAnisotropic.webidl
+++ b/components/script/dom/webidls/EXTTextureFilterAnisotropic.webidl
@@ -6,7 +6,7 @@
  * https://www.khronos.org/registry/webgl/extensions/EXT_texture_filter_anisotropic/
  */
 
-[NoInterfaceObject, Exposed=Window]
+[LegacyNoInterfaceObject, Exposed=Window]
 interface EXTTextureFilterAnisotropic {
   const GLenum TEXTURE_MAX_ANISOTROPY_EXT       = 0x84FE;
   const GLenum MAX_TEXTURE_MAX_ANISOTROPY_EXT   = 0x84FF;
diff --git a/components/script/dom/webidls/Element.webidl b/components/script/dom/webidls/Element.webidl
index 319964a7e74..9c3980e527f 100644
--- a/components/script/dom/webidls/Element.webidl
+++ b/components/script/dom/webidls/Element.webidl
@@ -113,9 +113,9 @@ partial interface Element {
 // https://w3c.github.io/DOM-Parsing/#extensions-to-the-element-interface
 partial interface Element {
   [CEReactions, Throws]
-  attribute [TreatNullAs=EmptyString] DOMString innerHTML;
+  attribute [LegacyNullToEmptyString] DOMString innerHTML;
   [CEReactions, Throws]
-  attribute [TreatNullAs=EmptyString] DOMString outerHTML;
+  attribute [LegacyNullToEmptyString] DOMString outerHTML;
 };
 
 // https://fullscreen.spec.whatwg.org/#api
diff --git a/components/script/dom/webidls/Event.webidl b/components/script/dom/webidls/Event.webidl
index e7888b38fb3..ae57dc1a8a8 100644
--- a/components/script/dom/webidls/Event.webidl
+++ b/components/script/dom/webidls/Event.webidl
@@ -34,7 +34,7 @@ interface Event {
   [Pure]
   readonly attribute boolean defaultPrevented;
 
-  [Unforgeable]
+  [LegacyUnforgeable]
   readonly attribute boolean isTrusted;
   [Constant]
   readonly attribute DOMHighResTimeStamp timeStamp;
diff --git a/components/script/dom/webidls/EventHandler.webidl b/components/script/dom/webidls/EventHandler.webidl
index 57138967792..4303bb19532 100644
--- a/components/script/dom/webidls/EventHandler.webidl
+++ b/components/script/dom/webidls/EventHandler.webidl
@@ -10,17 +10,17 @@
  * and create derivative works of this document.
  */
 
-[TreatNonObjectAsNull]
+[LegacyTreatNonObjectAsNull]
 callback EventHandlerNonNull = any (Event event);
 typedef EventHandlerNonNull? EventHandler;
 
-[TreatNonObjectAsNull]
+[LegacyTreatNonObjectAsNull]
 callback OnErrorEventHandlerNonNull = any ((Event or DOMString) event, optional DOMString source,
                                                optional unsigned long lineno, optional unsigned long column,
                                                optional any error);
 typedef OnErrorEventHandlerNonNull? OnErrorEventHandler;
 
-[TreatNonObjectAsNull]
+[LegacyTreatNonObjectAsNull]
 callback OnBeforeUnloadEventHandlerNonNull = DOMString? (Event event);
 typedef OnBeforeUnloadEventHandlerNonNull? OnBeforeUnloadEventHandler;
 
@@ -62,8 +62,8 @@ interface mixin GlobalEventHandlers {
            attribute EventHandler onloadedmetadata;
            attribute EventHandler onloadstart;
            attribute EventHandler onmousedown;
-           [LenientThis] attribute EventHandler onmouseenter;
-           [LenientThis] attribute EventHandler onmouseleave;
+           [LegacyLenientThis] attribute EventHandler onmouseenter;
+           [LegacyLenientThis] attribute EventHandler onmouseleave;
            attribute EventHandler onmousemove;
            attribute EventHandler onmouseout;
            attribute EventHandler onmouseover;
diff --git a/components/script/dom/webidls/HTMLAudioElement.webidl b/components/script/dom/webidls/HTMLAudioElement.webidl
index bad06df5cfc..ad22f727668 100644
--- a/components/script/dom/webidls/HTMLAudioElement.webidl
+++ b/components/script/dom/webidls/HTMLAudioElement.webidl
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#htmlaudioelement
-[Exposed=Window, NamedConstructor=Audio(optional DOMString src)]
+[Exposed=Window, LegacyFactoryFunction=Audio(optional DOMString src)]
 interface HTMLAudioElement : HTMLMediaElement {
   [HTMLConstructor] constructor();
 };
diff --git a/components/script/dom/webidls/HTMLBodyElement.webidl b/components/script/dom/webidls/HTMLBodyElement.webidl
index a84d800ff10..102f5bec41a 100644
--- a/components/script/dom/webidls/HTMLBodyElement.webidl
+++ b/components/script/dom/webidls/HTMLBodyElement.webidl
@@ -13,17 +13,17 @@ HTMLBodyElement includes WindowEventHandlers;
 
 // https://html.spec.whatwg.org/multipage/#HTMLBodyElement-partial
 partial interface HTMLBodyElement {
-  [CEReactions] attribute [TreatNullAs=EmptyString] DOMString text;
+  [CEReactions] attribute [LegacyNullToEmptyString] DOMString text;
 
   // https://github.com/servo/servo/issues/8715
-  //[CEReactions, TreatNullAs=EmptyString] attribute DOMString link;
+  //[CEReactions, LegacyNullToEmptyString] attribute DOMString link;
 
   // https://github.com/servo/servo/issues/8716
-  //[CEReactions, TreatNullAs=EmptyString] attribute DOMString vLink;
+  //[CEReactions, LegacyNullToEmptyString] attribute DOMString vLink;
 
   // https://github.com/servo/servo/issues/8717
-  //[CEReactions, TreatNullAs=EmptyString] attribute DOMString aLink;
+  //[CEReactions, LegacyNullToEmptyString] attribute DOMString aLink;
 
-  [CEReactions] attribute [TreatNullAs=EmptyString] DOMString bgColor;
+  [CEReactions] attribute [LegacyNullToEmptyString] DOMString bgColor;
   [CEReactions] attribute DOMString background;
 };
diff --git a/components/script/dom/webidls/HTMLElement.webidl b/components/script/dom/webidls/HTMLElement.webidl
index 961e79ec405..ebe52aa854b 100644
--- a/components/script/dom/webidls/HTMLElement.webidl
+++ b/components/script/dom/webidls/HTMLElement.webidl
@@ -48,7 +48,7 @@ interface HTMLElement : Element {
   //         attribute boolean spellcheck;
   // void forceSpellCheck();
 
-  attribute [TreatNullAs=EmptyString] DOMString innerText;
+  attribute [LegacyNullToEmptyString] DOMString innerText;
 
   // command API
   // readonly attribute DOMString? commandType;
diff --git a/components/script/dom/webidls/HTMLFontElement.webidl b/components/script/dom/webidls/HTMLFontElement.webidl
index c85a3cdd3f2..ca1a8680e5d 100644
--- a/components/script/dom/webidls/HTMLFontElement.webidl
+++ b/components/script/dom/webidls/HTMLFontElement.webidl
@@ -8,7 +8,7 @@ interface HTMLFontElement : HTMLElement {
   [HTMLConstructor] constructor();
 
   [CEReactions]
-  attribute [TreatNullAs=EmptyString] DOMString color;
+  attribute [LegacyNullToEmptyString] DOMString color;
   [CEReactions]
   attribute DOMString face;
   [CEReactions]
diff --git a/components/script/dom/webidls/HTMLFrameElement.webidl b/components/script/dom/webidls/HTMLFrameElement.webidl
index fe6cab1a5c2..913ed9c0325 100644
--- a/components/script/dom/webidls/HTMLFrameElement.webidl
+++ b/components/script/dom/webidls/HTMLFrameElement.webidl
@@ -22,8 +22,8 @@ interface HTMLFrameElement : HTMLElement {
   // readonly attribute Document? contentDocument;
   // readonly attribute WindowProxy? contentWindow;
 
-  // [CEReactions, TreatNullAs=EmptyString]
+  // [CEReactions, LegacyNullToEmptyString]
   // attribute DOMString marginHeight;
-  // [CEReactions, TreatNullAs=EmptyString]
+  // [CEReactions, LegacyNullToEmptyString]
   // attribute DOMString marginWidth;
 };
diff --git a/components/script/dom/webidls/HTMLIFrameElement.webidl b/components/script/dom/webidls/HTMLIFrameElement.webidl
index b9dd97bdea6..779e56f9ad8 100644
--- a/components/script/dom/webidls/HTMLIFrameElement.webidl
+++ b/components/script/dom/webidls/HTMLIFrameElement.webidl
@@ -42,8 +42,8 @@ partial interface HTMLIFrameElement {
   // [CEReactions]
   //         attribute DOMString longDesc;
 
-  // [CEReactions, TreatNullAs=EmptyString]
+  // [CEReactions, LegacyNullToEmptyString]
   // attribute DOMString marginHeight;
-  // [CEReactions, TreatNullAs=EmptyString]
+  // [CEReactions, LegacyNullToEmptyString]
   // attribute DOMString marginWidth;
 };
diff --git a/components/script/dom/webidls/HTMLImageElement.webidl b/components/script/dom/webidls/HTMLImageElement.webidl
index 81f6b4674f1..0d242fefb26 100644
--- a/components/script/dom/webidls/HTMLImageElement.webidl
+++ b/components/script/dom/webidls/HTMLImageElement.webidl
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#htmlimageelement
-[Exposed=Window, NamedConstructor=Image(optional unsigned long width, optional unsigned long height)]
+[Exposed=Window, LegacyFactoryFunction=Image(optional unsigned long width, optional unsigned long height)]
 interface HTMLImageElement : HTMLElement {
   [HTMLConstructor] constructor();
 
@@ -48,7 +48,7 @@ partial interface HTMLImageElement {
            attribute DOMString longDesc;
 
   [CEReactions]
-  attribute [TreatNullAs=EmptyString] DOMString border;
+  attribute [LegacyNullToEmptyString] DOMString border;
 };
 
 // https://drafts.csswg.org/cssom-view/#extensions-to-the-htmlimageelement-interface
diff --git a/components/script/dom/webidls/HTMLInputElement.webidl b/components/script/dom/webidls/HTMLInputElement.webidl
index 3c9f2516717..61f609605ec 100644
--- a/components/script/dom/webidls/HTMLInputElement.webidl
+++ b/components/script/dom/webidls/HTMLInputElement.webidl
@@ -71,7 +71,7 @@ interface HTMLInputElement : HTMLElement {
   [CEReactions]
            attribute DOMString defaultValue;
   [CEReactions, SetterThrows]
-           attribute [TreatNullAs=EmptyString] DOMString value;
+           attribute [LegacyNullToEmptyString] DOMString value;
   [SetterThrows]
            attribute object? valueAsDate;
   [SetterThrows]
diff --git a/components/script/dom/webidls/HTMLObjectElement.webidl b/components/script/dom/webidls/HTMLObjectElement.webidl
index 4c47fcfb93f..fc7db3fe43f 100644
--- a/components/script/dom/webidls/HTMLObjectElement.webidl
+++ b/components/script/dom/webidls/HTMLObjectElement.webidl
@@ -49,5 +49,5 @@ partial interface HTMLObjectElement {
   //         attribute DOMString codeBase;
   //         attribute DOMString codeType;
 
-  //[TreatNullAs=EmptyString] attribute DOMString border;
+  //[LegacyNullToEmptyString] attribute DOMString border;
 };
diff --git a/components/script/dom/webidls/HTMLOptionElement.webidl b/components/script/dom/webidls/HTMLOptionElement.webidl
index c995070d0e7..a10761c2428 100644
--- a/components/script/dom/webidls/HTMLOptionElement.webidl
+++ b/components/script/dom/webidls/HTMLOptionElement.webidl
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#htmloptionelement
-[Exposed=Window, NamedConstructor=Option(optional DOMString text = "", optional DOMString value,
+[Exposed=Window, LegacyFactoryFunction=Option(optional DOMString text = "", optional DOMString value,
                          optional boolean defaultSelected = false,
                          optional boolean selected = false)]
 interface HTMLOptionElement : HTMLElement {
diff --git a/components/script/dom/webidls/HTMLTableCellElement.webidl b/components/script/dom/webidls/HTMLTableCellElement.webidl
index 3c955de66b9..7ec277d5bda 100644
--- a/components/script/dom/webidls/HTMLTableCellElement.webidl
+++ b/components/script/dom/webidls/HTMLTableCellElement.webidl
@@ -43,5 +43,5 @@ partial interface HTMLTableCellElement {
   //          attribute DOMString vAlign;
 
   [CEReactions]
-  attribute [TreatNullAs=EmptyString] DOMString bgColor;
+  attribute [LegacyNullToEmptyString] DOMString bgColor;
 };
diff --git a/components/script/dom/webidls/HTMLTableElement.webidl b/components/script/dom/webidls/HTMLTableElement.webidl
index bc389bfb796..72a151fc858 100644
--- a/components/script/dom/webidls/HTMLTableElement.webidl
+++ b/components/script/dom/webidls/HTMLTableElement.webidl
@@ -51,9 +51,9 @@ partial interface HTMLTableElement {
   attribute DOMString width;
 
   [CEReactions]
-           attribute [TreatNullAs=EmptyString] DOMString bgColor;
-  // [CEReactions, TreatNullAs=EmptyString]
+           attribute [LegacyNullToEmptyString] DOMString bgColor;
+  // [CEReactions, LegacyNullToEmptyString]
   //          attribute DOMString cellPadding;
-  // [CEReactions, TreatNullAs=EmptyString]
+  // [CEReactions, LegacyNullToEmptyString]
   //          attribute DOMString cellSpacing;
 };
diff --git a/components/script/dom/webidls/HTMLTableRowElement.webidl b/components/script/dom/webidls/HTMLTableRowElement.webidl
index 3f2db6fb720..00d3fecd9e1 100644
--- a/components/script/dom/webidls/HTMLTableRowElement.webidl
+++ b/components/script/dom/webidls/HTMLTableRowElement.webidl
@@ -30,5 +30,5 @@ partial interface HTMLTableRowElement {
   //          attribute DOMString vAlign;
 
   [CEReactions]
-           attribute [TreatNullAs=EmptyString] DOMString bgColor;
+           attribute [LegacyNullToEmptyString] DOMString bgColor;
 };
diff --git a/components/script/dom/webidls/HTMLTextAreaElement.webidl b/components/script/dom/webidls/HTMLTextAreaElement.webidl
index e9ffbd0a9e6..a8e79095680 100644
--- a/components/script/dom/webidls/HTMLTextAreaElement.webidl
+++ b/components/script/dom/webidls/HTMLTextAreaElement.webidl
@@ -40,7 +40,7 @@ interface HTMLTextAreaElement : HTMLElement {
   readonly attribute DOMString type;
   [CEReactions]
            attribute DOMString defaultValue;
-           attribute [TreatNullAs=EmptyString] DOMString value;
+           attribute [LegacyNullToEmptyString] DOMString value;
   readonly attribute unsigned long textLength;
 
   readonly attribute boolean willValidate;
diff --git a/components/script/dom/webidls/Location.webidl b/components/script/dom/webidls/Location.webidl
index b56cc220932..6c5833cfdcf 100644
--- a/components/script/dom/webidls/Location.webidl
+++ b/components/script/dom/webidls/Location.webidl
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#location
-[Exposed=Window, Unforgeable] interface Location {
+[Exposed=Window, LegacyUnforgeable] interface Location {
   [Throws, CrossOriginWritable]
         stringifier attribute USVString href;
   [Throws] readonly attribute USVString origin;
diff --git a/components/script/dom/webidls/MediaList.webidl b/components/script/dom/webidls/MediaList.webidl
index e3c9cd6e680..d3a5527130f 100644
--- a/components/script/dom/webidls/MediaList.webidl
+++ b/components/script/dom/webidls/MediaList.webidl
@@ -5,7 +5,7 @@
 // https://drafts.csswg.org/cssom/#the-medialist-interface
 [Exposed=Window]
 interface MediaList {
-  stringifier attribute [TreatNullAs=EmptyString] DOMString mediaText;
+  stringifier attribute [LegacyNullToEmptyString] DOMString mediaText;
   readonly attribute unsigned long length;
   getter DOMString? item(unsigned long index);
   undefined appendMedium(DOMString medium);
diff --git a/components/script/dom/webidls/OESElementIndexUint.webidl b/components/script/dom/webidls/OESElementIndexUint.webidl
index 01a441e9946..a1e631e47b8 100644
--- a/components/script/dom/webidls/OESElementIndexUint.webidl
+++ b/components/script/dom/webidls/OESElementIndexUint.webidl
@@ -6,6 +6,6 @@
  * https://www.khronos.org/registry/webgl/extensions/OES_element_index_uint/
  */
 
-[NoInterfaceObject, Exposed=Window]
+[LegacyNoInterfaceObject, Exposed=Window]
 interface OESElementIndexUint {
 };
diff --git a/components/script/dom/webidls/OESStandardDerivatives.webidl b/components/script/dom/webidls/OESStandardDerivatives.webidl
index 0e4c51e4df3..e0190a4075a 100644
--- a/components/script/dom/webidls/OESStandardDerivatives.webidl
+++ b/components/script/dom/webidls/OESStandardDerivatives.webidl
@@ -6,7 +6,7 @@
  * https://www.khronos.org/registry/webgl/extensions/OES_standard_derivatives/
  */
 
-[NoInterfaceObject, Exposed=Window]
+[LegacyNoInterfaceObject, Exposed=Window]
 interface OESStandardDerivatives {
     const GLenum FRAGMENT_SHADER_DERIVATIVE_HINT_OES = 0x8B8B;
 };
diff --git a/components/script/dom/webidls/OESTextureFloat.webidl b/components/script/dom/webidls/OESTextureFloat.webidl
index f053a405977..63d968522d5 100644
--- a/components/script/dom/webidls/OESTextureFloat.webidl
+++ b/components/script/dom/webidls/OESTextureFloat.webidl
@@ -6,6 +6,6 @@
  * https://www.khronos.org/registry/webgl/extensions/OES_texture_float/
  */
 
-[NoInterfaceObject, Exposed=Window]
+[LegacyNoInterfaceObject, Exposed=Window]
 interface OESTextureFloat {
 };
diff --git a/components/script/dom/webidls/OESTextureFloatLinear.webidl b/components/script/dom/webidls/OESTextureFloatLinear.webidl
index f0abf5a1aac..84a21cbfe65 100644
--- a/components/script/dom/webidls/OESTextureFloatLinear.webidl
+++ b/components/script/dom/webidls/OESTextureFloatLinear.webidl
@@ -6,6 +6,6 @@
  * https://www.khronos.org/registry/webgl/extensions/OES_texture_float_linear/
  */
 
-[NoInterfaceObject, Exposed=Window]
+[LegacyNoInterfaceObject, Exposed=Window]
 interface OESTextureFloatLinear {
 };
diff --git a/components/script/dom/webidls/OESTextureHalfFloat.webidl b/components/script/dom/webidls/OESTextureHalfFloat.webidl
index cba71c8cb56..55045ba7b4e 100644
--- a/components/script/dom/webidls/OESTextureHalfFloat.webidl
+++ b/components/script/dom/webidls/OESTextureHalfFloat.webidl
@@ -6,7 +6,7 @@
  * https://www.khronos.org/registry/webgl/extensions/OES_texture_half_float/
  */
 
-[NoInterfaceObject, Exposed=Window]
+[LegacyNoInterfaceObject, Exposed=Window]
 interface OESTextureHalfFloat {
     const GLenum HALF_FLOAT_OES = 0x8D61;
 };
diff --git a/components/script/dom/webidls/OESTextureHalfFloatLinear.webidl b/components/script/dom/webidls/OESTextureHalfFloatLinear.webidl
index 61454dd9cdb..fe8d44e8752 100644
--- a/components/script/dom/webidls/OESTextureHalfFloatLinear.webidl
+++ b/components/script/dom/webidls/OESTextureHalfFloatLinear.webidl
@@ -6,6 +6,6 @@
  * https://www.khronos.org/registry/webgl/extensions/OES_texture_half_float_linear/
  */
 
-[NoInterfaceObject, Exposed=Window]
+[LegacyNoInterfaceObject, Exposed=Window]
 interface OESTextureHalfFloatLinear {
 };
diff --git a/components/script/dom/webidls/OESVertexArrayObject.webidl b/components/script/dom/webidls/OESVertexArrayObject.webidl
index 0996ef45d91..48e2daeb31a 100644
--- a/components/script/dom/webidls/OESVertexArrayObject.webidl
+++ b/components/script/dom/webidls/OESVertexArrayObject.webidl
@@ -6,7 +6,7 @@
  * https://www.khronos.org/registry/webgl/extensions/OES_vertex_array_object/
  */
 
-[NoInterfaceObject, Exposed=Window]
+[LegacyNoInterfaceObject, Exposed=Window]
 interface OESVertexArrayObject {
     const unsigned long VERTEX_ARRAY_BINDING_OES = 0x85B5;
 
diff --git a/components/script/dom/webidls/Promise.webidl b/components/script/dom/webidls/Promise.webidl
index f4f6616f107..2e402d1a54e 100644
--- a/components/script/dom/webidls/Promise.webidl
+++ b/components/script/dom/webidls/Promise.webidl
@@ -10,7 +10,7 @@ callback PromiseJobCallback = undefined();
 [TreatNonCallableAsNull]
 callback AnyCallback = any (any value);
 
-[NoInterfaceObject, Exposed=(Window,Worker)]
+[LegacyNoInterfaceObject, Exposed=(Window,Worker)]
 // Need to escape "Promise" so it's treated as an identifier.
 interface _Promise {
 };
diff --git a/components/script/dom/webidls/PromiseNativeHandler.webidl b/components/script/dom/webidls/PromiseNativeHandler.webidl
index 7d5f35e3223..aff2e43a855 100644
--- a/components/script/dom/webidls/PromiseNativeHandler.webidl
+++ b/components/script/dom/webidls/PromiseNativeHandler.webidl
@@ -7,7 +7,7 @@
 
 // Hack to allow us to have JS owning and properly tracing/CCing/etc a
 // PromiseNativeHandler.
-[NoInterfaceObject,
+[LegacyNoInterfaceObject,
  Exposed=(Window,Worker)]
 interface PromiseNativeHandler {
 };
diff --git a/components/script/dom/webidls/ReadableStream.webidl b/components/script/dom/webidls/ReadableStream.webidl
index 3662ca75ab8..d03212e3e9e 100644
--- a/components/script/dom/webidls/ReadableStream.webidl
+++ b/components/script/dom/webidls/ReadableStream.webidl
@@ -5,7 +5,7 @@
 // This interface is entirely internal to Servo, and should not be accessible to
 // web pages.
 
-[NoInterfaceObject, Exposed=(Window,Worker)]
+[LegacyNoInterfaceObject, Exposed=(Window,Worker)]
 // Need to escape "ReadableStream" so it's treated as an identifier.
 interface _ReadableStream {
 };
diff --git a/components/script/dom/webidls/ServoParser.webidl b/components/script/dom/webidls/ServoParser.webidl
index 89350130919..0e30e557905 100644
--- a/components/script/dom/webidls/ServoParser.webidl
+++ b/components/script/dom/webidls/ServoParser.webidl
@@ -6,5 +6,5 @@
 // web pages.
 
 [Exposed=(Window,Worker),
- NoInterfaceObject]
+ LegacyNoInterfaceObject]
 interface ServoParser {};
diff --git a/components/script/dom/webidls/WEBGLColorBufferFloat.webidl b/components/script/dom/webidls/WEBGLColorBufferFloat.webidl
index dd041927ec1..72004df6167 100644
--- a/components/script/dom/webidls/WEBGLColorBufferFloat.webidl
+++ b/components/script/dom/webidls/WEBGLColorBufferFloat.webidl
@@ -6,7 +6,7 @@
  * https://www.khronos.org/registry/webgl/extensions/WEBGL_color_buffer_float/
  */
 
-[NoInterfaceObject, Exposed=Window]
+[LegacyNoInterfaceObject, Exposed=Window]
 interface WEBGLColorBufferFloat {
   const GLenum RGBA32F_EXT = 0x8814;
   const GLenum FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT = 0x8211;
diff --git a/components/script/dom/webidls/WEBGLCompressedTextureETC1.webidl b/components/script/dom/webidls/WEBGLCompressedTextureETC1.webidl
index 77f80197c97..479139fdbe9 100644
--- a/components/script/dom/webidls/WEBGLCompressedTextureETC1.webidl
+++ b/components/script/dom/webidls/WEBGLCompressedTextureETC1.webidl
@@ -6,7 +6,7 @@
  * https://www.khronos.org/registry/webgl/extensions/WEBGL_compressed_texture_etc1/
  */
 
-[NoInterfaceObject, Exposed=Window]
+[LegacyNoInterfaceObject, Exposed=Window]
 interface WEBGLCompressedTextureETC1 {
     /* Compressed Texture Format */
     const GLenum COMPRESSED_RGB_ETC1_WEBGL = 0x8D64;
diff --git a/components/script/dom/webidls/WEBGLCompressedTextureS3TC.webidl b/components/script/dom/webidls/WEBGLCompressedTextureS3TC.webidl
index f940028bf5d..c04957f6bd4 100644
--- a/components/script/dom/webidls/WEBGLCompressedTextureS3TC.webidl
+++ b/components/script/dom/webidls/WEBGLCompressedTextureS3TC.webidl
@@ -6,7 +6,7 @@
  * https://www.khronos.org/registry/webgl/extensions/WEBGL_compressed_texture_s3tc/
  */
 
-[NoInterfaceObject, Exposed=Window]
+[LegacyNoInterfaceObject, Exposed=Window]
 interface WEBGLCompressedTextureS3TC {
     /* Compressed Texture Formats */
     const GLenum COMPRESSED_RGB_S3TC_DXT1_EXT  = 0x83F0;
diff --git a/components/script/dom/webidls/WebGLVertexArrayObjectOES.webidl b/components/script/dom/webidls/WebGLVertexArrayObjectOES.webidl
index e576bd6089d..e33e058f2b4 100644
--- a/components/script/dom/webidls/WebGLVertexArrayObjectOES.webidl
+++ b/components/script/dom/webidls/WebGLVertexArrayObjectOES.webidl
@@ -6,6 +6,6 @@
  * https://www.khronos.org/registry/webgl/extensions/OES_vertex_array_object/
  */
 
-[NoInterfaceObject, Exposed=Window]
+[LegacyNoInterfaceObject, Exposed=Window]
 interface WebGLVertexArrayObjectOES: WebGLObject {
 };
diff --git a/components/script/dom/webidls/Window.webidl b/components/script/dom/webidls/Window.webidl
index 23aaa8fa07d..64855d42860 100644
--- a/components/script/dom/webidls/Window.webidl
+++ b/components/script/dom/webidls/Window.webidl
@@ -6,13 +6,13 @@
 [Global=Window, Exposed=Window /*, LegacyUnenumerableNamedProperties */]
 /*sealed*/ interface Window : GlobalScope {
   // the current browsing context
-  [Unforgeable, CrossOriginReadable] readonly attribute WindowProxy window;
+  [LegacyUnforgeable, CrossOriginReadable] readonly attribute WindowProxy window;
   [BinaryName="Self_", Replaceable, CrossOriginReadable] readonly attribute WindowProxy self;
-  [Unforgeable] readonly attribute Document document;
+  [LegacyUnforgeable] readonly attribute Document document;
 
   attribute DOMString name;
 
-  [PutForwards=href, Unforgeable, CrossOriginReadable, CrossOriginWritable]
+  [PutForwards=href, LegacyUnforgeable, CrossOriginReadable, CrossOriginWritable]
     readonly attribute Location location;
   readonly attribute History history;
   [Pref="dom.customelements.enabled"]
@@ -35,7 +35,7 @@
   [Replaceable, CrossOriginReadable] readonly attribute unsigned long length;
   // Note that this can return null in the case that the browsing context has been discarded.
   // https://github.com/whatwg/html/issues/2115
-  [Unforgeable, CrossOriginReadable] readonly attribute WindowProxy? top;
+  [LegacyUnforgeable, CrossOriginReadable] readonly attribute WindowProxy? top;
   [CrossOriginReadable] attribute any opener;
   // Note that this can return null in the case that the browsing context has been discarded.
   // https://github.com/whatwg/html/issues/2115
diff --git a/components/script/dom/webidls/WindowProxy.webidl b/components/script/dom/webidls/WindowProxy.webidl
index a4fd2a3f79c..8f102540bba 100644
--- a/components/script/dom/webidls/WindowProxy.webidl
+++ b/components/script/dom/webidls/WindowProxy.webidl
@@ -3,5 +3,5 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#the-windowproxy-exotic-object
-[Exposed=(Window,DissimilarOriginWindow), NoInterfaceObject]
+[Exposed=(Window,DissimilarOriginWindow), LegacyNoInterfaceObject]
 interface WindowProxy {};