webidl 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 142902bff409ee76e33c35f7259aa5a9ab22a1f6
-  data.tar.gz: 05258c4d9be4aa0b1a5fd9d73ec98c0b982f64b6
+  metadata.gz: f14ae8f706ecedd826e99ad6714b987cb3b15370
+  data.tar.gz: fc61dac4ccd45fc210cc4bc5d5148a1210c54f40
 SHA512:
-  metadata.gz: e432757b5cb73096b113b2e3cf1cb868c3632c85fc113e15ca2c0016998379c18cca390efbb9f5bb453457d02a68e7abe40724b9ce33d167b436fa80835f3244
-  data.tar.gz: b807888599c3318830b0da27d88c195d0aa70ea747862be0d6973fff33391be5c0ff6401d130bb1f4692e2d5ce6e1b27ef261d3450136e8da3ff3168c9e45b27
+  metadata.gz: c57a418abd44297d88c45b029ff010ebea9f94dcae657a04baa52d79262a083ddc529ce317e8849ae84382d86f76188b8b3b416996450c8a90a4578c584f1eb1
+  data.tar.gz: 94f9fcec25a2b4c314ee0c06db001904fe7ead3111da6a6a45e42517d364836c7982360275633d764a1874f6c25fbc01fa9a0c7cb6b6a1f1e6687a5a5c1aea38

data/Rakefile

@@ -24,7 +24,7 @@ end
 
 namespace :webidl do
   WEBIDL_URL = "http://dev.w3.org/2006/webapi/WebIDL/"
-  HTML5_URL = "http://www.whatwg.org/specs/web-apps/current-work/"
+  HTML5_URL = "https://www.whatwg.org/specs/web-apps/current-work/"
 
   desc "Download the webidl spec to support/"
   task :download do

data/lib/webidl.rb

@@ -53,6 +53,7 @@ require "webidl/ast/exception"
 require "webidl/ast/attribute"
 require "webidl/ast/field"
 require "webidl/ast/implements_statement"
+require "webidl/ast/promise_type"
 
 require "webidl/parser/debug_helper"
 require "webidl/parser/idl"

data/lib/webidl/ast/promise_type.rb

@@ -0,0 +1,13 @@
+module WebIDL
+  module Ast
+    class PromiseType < Node
+
+      attr_reader :return_type
+
+      def initialize(return_type)
+        @return_type = return_type
+      end
+
+    end # PromiseType
+  end # Ast
+end # WebIDL

data/lib/webidl/parse_tree/extended_attributes.rb

@@ -37,5 +37,11 @@ module WebIDL
       end
     end
 
+    class ExtendedAttributeIdentList < Treetop::Runtime::SyntaxNode
+      def build(parent)
+        [key.text_value, list.text_value.split(",").map(&:strip)]
+      end
+    end
+
   end # ParseTree
 end # WebIDL

data/lib/webidl/parser/idl.treetop

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module WebIDL
   module Parser
 
@@ -18,11 +19,11 @@ module WebIDL
         / TypeDef
         / ImplementsStatement
       end
-      
+
       rule CallbackOrInterface
-        "callback" ws obj:CallbackRestOrInterface { def build(parent) obj.build(parent) end } 
+        "callback" ws obj:CallbackRestOrInterface { def build(parent) obj.build(parent) end }
       end
-      
+
       rule CallbackRestOrInterface
         CallbackRest / Interface
       end
@@ -93,7 +94,7 @@ module WebIDL
       rule ExceptionMembers
         (eal:ExtendedAttributeList ws member:ExceptionMember ws members:ExceptionMembers ws <ParseTree::InterfaceMembers>)?
       end
-      
+
       rule CallbackRest
         name:identifier ws "=" ws return_type:ReturnType ws "(" ws args:ArgumentList ")" ws ";" <ParseTree::Callback>
       end
@@ -291,6 +292,7 @@ module WebIDL
         / ExtendedAttributeIdent
         / ExtendedAttributeScopedName
         / ExtendedAttributeArgList
+        / ExtendedAttributeIdentList
         / ExtendedAttributeNoArg
       end
 
@@ -318,6 +320,20 @@ module WebIDL
         key:identifier "=" value:(name:identifier "(" ws args:ArgumentList ws ")" <ParseTree::ExtendedAttributeArgList>) <ParseTree::ExtendedAttributeNamedArgList>
       end
 
+      rule ExtendedAttributeIdentList
+        key:identifier "=" "(" list:IdentifierList ")" <ParseTree::ExtendedAttributeIdentList>
+      end
+
+      rule IdentifierList
+        identifier Identifiers
+      end
+
+      rule Identifiers
+        ("," IdentifierList)?
+      end
+
+
+
 
     #  rule ExtendedAttribute
     #      "(" ws ExtendedAttributeInner ws ")" ws ExtendedAttributeRest
@@ -417,6 +433,7 @@ module WebIDL
       rule NonAnyType
         type:PrimitiveType suffix:TypeSuffix <ParseTree::Type>
           # added: cannot be followed by a NonSpace character, since e.g. DOMStringMap, DOMStringList or other identifiers would break parsing
+          / type:PromiseType Null { def build(parent); type.build(parent); end }
           / type:"DOMString" suffix:TypeSuffix !NonSpace <ParseTree::Type>
           / "sequence" ws "<" ws type:Type ws ">" null:Null <ParseTree::SequenceType>
           / type:"object" suffix:TypeSuffix <ParseTree::Type>
@@ -424,6 +441,14 @@ module WebIDL
           / type:identifier suffix:TypeSuffix <ParseTree::Type>
       end
 
+      rule PromiseType
+         "Promise" "<" return_type:ReturnType ">" {
+            def build(parent)
+              Ast::PromiseType.new(return_type.text_value)
+            end
+         }
+      end
+
       rule ConstType
           PrimitiveType Null
           / identifier Null

data/lib/webidl/version.rb

@@ -1,3 +1,3 @@
 module WebIDL
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/spec/fixtures/html5.idl

@@ -21,23 +21,23 @@ interface HTMLFormControlsCollection : HTMLCollection {
 };
 
 interface RadioNodeList : NodeList {
-          attribute DOMString value;
+  attribute DOMString value;
 };
 
 interface HTMLOptionsCollection : HTMLCollection {
   // inherits item()
-           attribute unsigned long length; // shadows inherited length
+  attribute unsigned long length; // shadows inherited length
   legacycaller HTMLOptionElement? (DOMString name);
   setter creator void (unsigned long index, HTMLOptionElement? option);
   void add((HTMLOptionElement or HTMLOptGroupElement) element, optional (HTMLElement or long)? before = null);
   void remove(long index);
-           attribute long selectedIndex;
+  attribute long selectedIndex;
 };
 
 interface HTMLPropertiesCollection : HTMLCollection {
   // inherits length and item()
   getter PropertyNodeList? namedItem(DOMString name); // shadows inherited namedItem()
-  readonly attribute DOMString[] names;
+  [SameObject] readonly attribute DOMString[] names;
 };
 
 typedef sequence<any> PropertyValueArray;
@@ -46,7 +46,7 @@ interface PropertyNodeList : NodeList {
   PropertyValueArray getValues();
 };
 
-[OverrideBuiltins, Exposed=Window,Worker]
+[OverrideBuiltins, Exposed=(Window,Worker)]
 interface DOMStringMap {
   getter DOMString (DOMString name);
   setter creator void (DOMString name, DOMString value);
@@ -69,27 +69,27 @@ enum DocumentReadyState { "loading", "interactive", "complete" };
 partial /*sealed*/ interface Document {
   // resource metadata management
   [PutForwards=href, Unforgeable] readonly attribute Location? location;
-           attribute DOMString domain;
+  attribute DOMString domain;
   readonly attribute DOMString referrer;
-           attribute DOMString cookie;
+  attribute DOMString cookie;
   readonly attribute DOMString lastModified;
   readonly attribute DocumentReadyState readyState;
 
   // DOM tree accessors
   getter object (DOMString name);
-           attribute DOMString title;
-           attribute DOMString dir;
-           attribute HTMLElement? body;
+  attribute DOMString title;
+  attribute DOMString dir;
+  attribute HTMLElement? body;
   readonly attribute HTMLHeadElement? head;
-  readonly attribute HTMLCollection images;
-  readonly attribute HTMLCollection embeds;
-  readonly attribute HTMLCollection plugins;
-  readonly attribute HTMLCollection links;
-  readonly attribute HTMLCollection forms;
-  readonly attribute HTMLCollection scripts;
+  [SameObject] readonly attribute HTMLCollection images;
+  [SameObject] readonly attribute HTMLCollection embeds;
+  [SameObject] readonly attribute HTMLCollection plugins;
+  [SameObject] readonly attribute HTMLCollection links;
+  [SameObject] readonly attribute HTMLCollection forms;
+  [SameObject] readonly attribute HTMLCollection scripts;
   NodeList getElementsByName(DOMString elementName);
   NodeList getItems(optional DOMString typeNames = ""); // microdata
-  readonly attribute DOMElementMap cssElementMap;
+  [SameObject] readonly attribute DOMElementMap cssElementMap;
   readonly attribute HTMLScriptElement? currentScript;
 
   // dynamic markup insertion
@@ -103,7 +103,7 @@ partial /*sealed*/ interface Document {
   readonly attribute WindowProxy? defaultView;
   readonly attribute Element? activeElement;
   boolean hasFocus();
-           attribute DOMString designMode;
+  attribute DOMString designMode;
   boolean execCommand(DOMString commandId, optional boolean showUI = false, optional DOMString value = "");
   boolean queryCommandEnabled(DOMString commandId);
   boolean queryCommandIndeterm(DOMString commandId);
@@ -125,35 +125,33 @@ partial interface XMLDocument {
 
 interface HTMLElement : Element {
   // metadata attributes
-           attribute DOMString title;
-           attribute DOMString lang;
-           attribute boolean translate;
-           attribute DOMString dir;
-  readonly attribute DOMStringMap dataset;
+  attribute DOMString title;
+  attribute DOMString lang;
+  attribute boolean translate;
+  attribute DOMString dir;
+  [SameObject] readonly attribute DOMStringMap dataset;
 
   // microdata
-           attribute boolean itemScope;
+  attribute boolean itemScope;
   [PutForwards=value] readonly attribute DOMSettableTokenList itemType;
-           attribute DOMString itemId;
+  attribute DOMString itemId;
   [PutForwards=value] readonly attribute DOMSettableTokenList itemRef;
   [PutForwards=value] readonly attribute DOMSettableTokenList itemProp;
   readonly attribute HTMLPropertiesCollection properties;
-           attribute any itemValue; // acts as DOMString on setting
+  attribute any itemValue; // acts as DOMString on setting
 
   // user interaction
-           attribute boolean hidden;
+  attribute boolean hidden;
   void click();
-           attribute long tabIndex;
+  attribute long tabIndex;
   void focus();
   void blur();
-           attribute DOMString accessKey;
+  attribute DOMString accessKey;
   readonly attribute DOMString accessKeyLabel;
-           attribute boolean draggable;
+  attribute boolean draggable;
   [PutForwards=value] readonly attribute DOMSettableTokenList dropzone;
-           attribute DOMString contentEditable;
-  readonly attribute boolean isContentEditable;
-           attribute HTMLMenuElement? contextMenu;
-           attribute boolean spellcheck;
+  attribute HTMLMenuElement? contextMenu;
+  attribute boolean spellcheck;
   void forceSpellCheck();
 
   // command API
@@ -165,6 +163,7 @@ interface HTMLElement : Element {
   readonly attribute boolean? commandChecked;
 };
 HTMLElement implements GlobalEventHandlers;
+HTMLElement implements ElementContentEditable;
 
 interface HTMLUnknownElement : HTMLElement { };
 
@@ -175,22 +174,22 @@ interface HTMLHtmlElement : HTMLElement {
 interface HTMLHeadElement : HTMLElement {};
 
 interface HTMLTitleElement : HTMLElement {
-           attribute DOMString text;
+  attribute DOMString text;
 };
 
 interface HTMLBaseElement : HTMLElement {
-           attribute DOMString href;
-           attribute DOMString target;
+  attribute DOMString href;
+  attribute DOMString target;
 };
 
 interface HTMLLinkElement : HTMLElement {
-           attribute DOMString href;
-           attribute DOMString crossOrigin;
-           attribute DOMString rel;
+  attribute DOMString href;
+  attribute DOMString? crossOrigin;
+  attribute DOMString rel;
   readonly attribute DOMTokenList relList;
-           attribute DOMString media;
-           attribute DOMString hreflang;
-           attribute DOMString type;
+  attribute DOMString media;
+  attribute DOMString hreflang;
+  attribute DOMString type;
   [PutForwards=value] readonly attribute DOMSettableTokenList sizes;
 
   // also has obsolete members
@@ -198,17 +197,17 @@ interface HTMLLinkElement : HTMLElement {
 HTMLLinkElement implements LinkStyle;
 
 interface HTMLMetaElement : HTMLElement {
-           attribute DOMString name;
-           attribute DOMString httpEquiv;
-           attribute DOMString content;
+  attribute DOMString name;
+  attribute DOMString httpEquiv;
+  attribute DOMString content;
 
   // also has obsolete members
 };
 
 interface HTMLStyleElement : HTMLElement {
-           attribute DOMString media;
-           attribute DOMString type;
-           attribute boolean scoped;
+  attribute DOMString media;
+  attribute DOMString type;
+  attribute boolean scoped;
 };
 HTMLStyleElement implements LinkStyle;
 
@@ -235,13 +234,13 @@ interface HTMLPreElement : HTMLElement {
 };
 
 interface HTMLQuoteElement : HTMLElement {
-           attribute DOMString cite;
+  attribute DOMString cite;
 };
 
 interface HTMLOListElement : HTMLElement {
-           attribute boolean reversed;
-           attribute long start;
-           attribute DOMString type;
+  attribute boolean reversed;
+  attribute long start;
+  attribute DOMString type;
 
   // also has obsolete members
 };
@@ -251,7 +250,7 @@ interface HTMLUListElement : HTMLElement {
 };
 
 interface HTMLLIElement : HTMLElement {
-           attribute long value;
+  attribute long value;
 
   // also has obsolete members
 };
@@ -265,26 +264,26 @@ interface HTMLDivElement : HTMLElement {
 };
 
 interface HTMLAnchorElement : HTMLElement {
-           attribute DOMString target;
-           attribute DOMString download;
+  attribute DOMString target;
+  attribute DOMString download;
   [PutForwards=value] attribute DOMSettableTokenList ping;
-           attribute DOMString rel;
+  attribute DOMString rel;
   readonly attribute DOMTokenList relList;
-           attribute DOMString hreflang;
-           attribute DOMString type;
+  attribute DOMString hreflang;
+  attribute DOMString type;
 
-           attribute DOMString text;
+  attribute DOMString text;
 
   // also has obsolete members
 };
 HTMLAnchorElement implements URLUtils;
 
 interface HTMLDataElement : HTMLElement {
-           attribute DOMString value;
+  attribute DOMString value;
 };
 
 interface HTMLTimeElement : HTMLElement {
-           attribute DOMString dateTime;
+  attribute DOMString dateTime;
 };
 
 interface HTMLSpanElement : HTMLElement {};
@@ -294,8 +293,16 @@ interface HTMLBRElement : HTMLElement {
 };
 
 interface HTMLModElement : HTMLElement {
-           attribute DOMString cite;
-           attribute DOMString dateTime;
+  attribute DOMString cite;
+  attribute DOMString dateTime;
+};
+
+interface HTMLPictureElement : HTMLElement {};
+
+partial interface HTMLSourceElement {
+           attribute DOMString srcset;
+           attribute DOMString sizes;
+           attribute DOMString media;
 };
 
 [NamedConstructor=Image(optional unsigned long width, optional unsigned long height)]
@@ -303,7 +310,8 @@ interface HTMLImageElement : HTMLElement {
            attribute DOMString alt;
            attribute DOMString src;
            attribute DOMString srcset;
-           attribute DOMString crossOrigin;
+           attribute DOMString sizes;
+           attribute DOMString? crossOrigin;
            attribute DOMString useMap;
            attribute boolean isMap;
            attribute unsigned long width;
@@ -311,46 +319,50 @@ interface HTMLImageElement : HTMLElement {
   readonly attribute unsigned long naturalWidth;
   readonly attribute unsigned long naturalHeight;
   readonly attribute boolean complete;
+  readonly attribute DOMString currentSrc;
 
   // also has obsolete members
 };
 
 interface HTMLIFrameElement : HTMLElement {
-           attribute DOMString src;
-           attribute DOMString srcdoc;
-           attribute DOMString name;
+  attribute DOMString src;
+  attribute DOMString srcdoc;
+  attribute DOMString name;
   [PutForwards=value] readonly attribute DOMSettableTokenList sandbox;
-           attribute boolean seamless;
-           attribute boolean allowFullscreen;
-           attribute DOMString width;
-           attribute DOMString height;
+  attribute boolean seamless;
+  attribute boolean allowFullscreen;
+  attribute DOMString width;
+  attribute DOMString height;
   readonly attribute Document? contentDocument;
   readonly attribute WindowProxy? contentWindow;
+  Document? getSVGDocument();
 
   // also has obsolete members
 };
 
 interface HTMLEmbedElement : HTMLElement {
-           attribute DOMString src;
-           attribute DOMString type;
-           attribute DOMString width;
-           attribute DOMString height;
+  attribute DOMString src;
+  attribute DOMString type;
+  attribute DOMString width;
+  attribute DOMString height;
+  Document? getSVGDocument();
   legacycaller any (any... arguments);
 
   // also has obsolete members
 };
 
 interface HTMLObjectElement : HTMLElement {
-           attribute DOMString data;
-           attribute DOMString type;
-           attribute boolean typeMustMatch;
-           attribute DOMString name;
-           attribute DOMString useMap;
+  attribute DOMString data;
+  attribute DOMString type;
+  attribute boolean typeMustMatch;
+  attribute DOMString name;
+  attribute DOMString useMap;
   readonly attribute HTMLFormElement? form;
-           attribute DOMString width;
-           attribute DOMString height;
+  attribute DOMString width;
+  attribute DOMString height;
   readonly attribute Document? contentDocument;
   readonly attribute WindowProxy? contentWindow;
+  Document? getSVGDocument();
 
   readonly attribute boolean willValidate;
   readonly attribute ValidityState validity;
@@ -365,34 +377,36 @@ interface HTMLObjectElement : HTMLElement {
 };
 
 interface HTMLParamElement : HTMLElement {
-           attribute DOMString name;
-           attribute DOMString value;
+  attribute DOMString name;
+  attribute DOMString value;
 
   // also has obsolete members
 };
 
 interface HTMLVideoElement : HTMLMediaElement {
-           attribute unsigned long width;
-           attribute unsigned long height;
+  attribute unsigned long width;
+  attribute unsigned long height;
   readonly attribute unsigned long videoWidth;
   readonly attribute unsigned long videoHeight;
-           attribute DOMString poster;
+  attribute DOMString poster;
 };
 
 [NamedConstructor=Audio(optional DOMString src)]
 interface HTMLAudioElement : HTMLMediaElement {};
 
 interface HTMLSourceElement : HTMLElement {
-           attribute DOMString src;
-           attribute DOMString type;
+  attribute DOMString src;
+  attribute DOMString type;
+
+  // also has obsolete members
 };
 
 interface HTMLTrackElement : HTMLElement {
-           attribute DOMString kind;
-           attribute DOMString src;
-           attribute DOMString srclang;
-           attribute DOMString label;
-           attribute boolean default;
+  attribute DOMString kind;
+  attribute DOMString src;
+  attribute DOMString srclang;
+  attribute DOMString label;
+  attribute boolean default;
 
   const unsigned short NONE = 0;
   const unsigned short LOADING = 1;
@@ -404,21 +418,23 @@ interface HTMLTrackElement : HTMLElement {
 };
 
 enum CanPlayTypeResult { "" /* empty string */, "maybe", "probably" };
+typedef (MediaStream or MediaSource or Blob) MediaProvider;
 interface HTMLMediaElement : HTMLElement {
 
   // error state
   readonly attribute MediaError? error;
 
   // network state
-           attribute DOMString src;
+  attribute DOMString src;
+  attribute MediaProvider? srcObject;
   readonly attribute DOMString currentSrc;
-           attribute DOMString crossOrigin;
+  attribute DOMString? crossOrigin;
   const unsigned short NETWORK_EMPTY = 0;
   const unsigned short NETWORK_IDLE = 1;
   const unsigned short NETWORK_LOADING = 2;
   const unsigned short NETWORK_NO_SOURCE = 3;
   readonly attribute unsigned short networkState;
-           attribute DOMString preload;
+  attribute DOMString preload;
   readonly attribute TimeRanges buffered;
   void load();
   CanPlayTypeResult canPlayType(DOMString type);
@@ -433,35 +449,35 @@ interface HTMLMediaElement : HTMLElement {
   readonly attribute boolean seeking;
 
   // playback state
-           attribute double currentTime;
+  attribute double currentTime;
   void fastSeek(double time);
   readonly attribute unrestricted double duration;
   Date getStartDate();
   readonly attribute boolean paused;
-           attribute double defaultPlaybackRate;
-           attribute double playbackRate;
+  attribute double defaultPlaybackRate;
+  attribute double playbackRate;
   readonly attribute TimeRanges played;
   readonly attribute TimeRanges seekable;
   readonly attribute boolean ended;
-           attribute boolean autoplay;
-           attribute boolean loop;
+  attribute boolean autoplay;
+  attribute boolean loop;
   void play();
   void pause();
 
   // media controller
-           attribute DOMString mediaGroup;
-           attribute MediaController? controller;
+  attribute DOMString mediaGroup;
+  attribute MediaController? controller;
 
   // controls
-           attribute boolean controls;
-           attribute double volume;
-           attribute boolean muted;
-           attribute boolean defaultMuted;
+  attribute boolean controls;
+  attribute double volume;
+  attribute boolean muted;
+  attribute boolean defaultMuted;
 
   // tracks
-  readonly attribute AudioTrackList audioTracks;
-  readonly attribute VideoTrackList videoTracks;
-  readonly attribute TextTrackList textTracks;
+  [SameObject] readonly attribute AudioTrackList audioTracks;
+  [SameObject] readonly attribute VideoTrackList videoTracks;
+  [SameObject] readonly attribute TextTrackList textTracks;
   TextTrack addTextTrack(TextTrackKind kind, optional DOMString label = "", optional DOMString language = "");
 };
 
@@ -478,9 +494,9 @@ interface AudioTrackList : EventTarget {
   getter AudioTrack (unsigned long index);
   AudioTrack? getTrackById(DOMString id);
 
-           attribute EventHandler onchange;
-           attribute EventHandler onaddtrack;
-           attribute EventHandler onremovetrack;
+  attribute EventHandler onchange;
+  attribute EventHandler onaddtrack;
+  attribute EventHandler onremovetrack;
 };
 
 interface AudioTrack {
@@ -488,7 +504,7 @@ interface AudioTrack {
   readonly attribute DOMString kind;
   readonly attribute DOMString label;
   readonly attribute DOMString language;
-           attribute boolean enabled;
+  attribute boolean enabled;
 };
 
 interface VideoTrackList : EventTarget {
@@ -497,9 +513,9 @@ interface VideoTrackList : EventTarget {
   VideoTrack? getTrackById(DOMString id);
   readonly attribute long selectedIndex;
 
-           attribute EventHandler onchange;
-           attribute EventHandler onaddtrack;
-           attribute EventHandler onremovetrack;
+  attribute EventHandler onchange;
+  attribute EventHandler onaddtrack;
+  attribute EventHandler onremovetrack;
 };
 
 interface VideoTrack {
@@ -507,7 +523,7 @@ interface VideoTrack {
   readonly attribute DOMString kind;
   readonly attribute DOMString label;
   readonly attribute DOMString language;
-           attribute boolean selected;
+  attribute boolean selected;
 };
 
 enum MediaControllerPlaybackState { "waiting", "playing", "ended" };
@@ -518,7 +534,7 @@ interface MediaController : EventTarget {
   readonly attribute TimeRanges buffered;
   readonly attribute TimeRanges seekable;
   readonly attribute unrestricted double duration;
-           attribute double currentTime;
+  attribute double currentTime;
 
   readonly attribute boolean paused;
   readonly attribute MediaControllerPlaybackState playbackState;
@@ -527,27 +543,27 @@ interface MediaController : EventTarget {
   void unpause();
   void play(); // calls play() on all media elements as well
 
-           attribute double defaultPlaybackRate;
-           attribute double playbackRate;
+  attribute double defaultPlaybackRate;
+  attribute double playbackRate;
 
-           attribute double volume;
-           attribute boolean muted;
+  attribute double volume;
+  attribute boolean muted;
 
-           attribute EventHandler onemptied;
-           attribute EventHandler onloadedmetadata;
-           attribute EventHandler onloadeddata;
-           attribute EventHandler oncanplay;
-           attribute EventHandler oncanplaythrough;
-           attribute EventHandler onplaying;
-           attribute EventHandler onended;
-           attribute EventHandler onwaiting;
+  attribute EventHandler onemptied;
+  attribute EventHandler onloadedmetadata;
+  attribute EventHandler onloadeddata;
+  attribute EventHandler oncanplay;
+  attribute EventHandler oncanplaythrough;
+  attribute EventHandler onplaying;
+  attribute EventHandler onended;
+  attribute EventHandler onwaiting;
 
-           attribute EventHandler ondurationchange;
-           attribute EventHandler ontimeupdate;
-           attribute EventHandler onplay;
-           attribute EventHandler onpause;
-           attribute EventHandler onratechange;
-           attribute EventHandler onvolumechange;
+  attribute EventHandler ondurationchange;
+  attribute EventHandler ontimeupdate;
+  attribute EventHandler onplay;
+  attribute EventHandler onpause;
+  attribute EventHandler onratechange;
+  attribute EventHandler onvolumechange;
 };
 
 interface TextTrackList : EventTarget {
@@ -555,9 +571,9 @@ interface TextTrackList : EventTarget {
   getter TextTrack (unsigned long index);
   TextTrack? getTrackById(DOMString id);
 
-           attribute EventHandler onchange;
-           attribute EventHandler onaddtrack;
-           attribute EventHandler onremovetrack;
+  attribute EventHandler onchange;
+  attribute EventHandler onaddtrack;
+  attribute EventHandler onremovetrack;
 };
 
 enum TextTrackMode { "disabled",  "hidden",  "showing" };
@@ -570,7 +586,7 @@ interface TextTrack : EventTarget {
   readonly attribute DOMString id;
   readonly attribute DOMString inBandMetadataTrackDispatchType;
 
-           attribute TextTrackMode mode;
+  attribute TextTrackMode mode;
 
   readonly attribute TextTrackCueList? cues;
   readonly attribute TextTrackCueList? activeCues;
@@ -578,7 +594,7 @@ interface TextTrack : EventTarget {
   void addCue(TextTrackCue cue);
   void removeCue(TextTrackCue cue);
 
-           attribute EventHandler oncuechange;
+  attribute EventHandler oncuechange;
 };
 
 interface TextTrackCueList {
@@ -590,13 +606,13 @@ interface TextTrackCueList {
 interface TextTrackCue : EventTarget {
   readonly attribute TextTrack? track;
 
-           attribute DOMString id;
-           attribute double startTime;
-           attribute double endTime;
-           attribute boolean pauseOnExit;
+  attribute DOMString id;
+  attribute double startTime;
+  attribute double endTime;
+  attribute boolean pauseOnExit;
 
-           attribute EventHandler onenter;
-           attribute EventHandler onexit;
+  attribute EventHandler onenter;
+  attribute EventHandler onexit;
 };
 
 interface TimeRanges {
@@ -607,43 +623,43 @@ interface TimeRanges {
 
 [Constructor(DOMString type, optional TrackEventInit eventInitDict)]
 interface TrackEvent : Event {
-  readonly attribute (VideoTrack or AudioTrack or TextTrack) track;
+  readonly attribute (VideoTrack or AudioTrack or TextTrack)? track;
 };
 
 dictionary TrackEventInit : EventInit {
-  (VideoTrack or AudioTrack or TextTrack) track;
+  (VideoTrack or AudioTrack or TextTrack)? track;
 };
 
 interface HTMLMapElement : HTMLElement {
-           attribute DOMString name;
+  attribute DOMString name;
   readonly attribute HTMLCollection areas;
   readonly attribute HTMLCollection images;
 };
 
 interface HTMLAreaElement : HTMLElement {
-           attribute DOMString alt;
-           attribute DOMString coords;
-           attribute DOMString shape;
-           attribute DOMString target;
-           attribute DOMString download;
+  attribute DOMString alt;
+  attribute DOMString coords;
+  attribute DOMString shape;
+  attribute DOMString target;
+  attribute DOMString download;
   [PutForwards=value] attribute DOMSettableTokenList ping;
-           attribute DOMString rel;
+  attribute DOMString rel;
   readonly attribute DOMTokenList relList;
-           attribute DOMString hreflang;
-           attribute DOMString type;
+  attribute DOMString hreflang;
+  attribute DOMString type;
 
   // also has obsolete members
 };
 HTMLAreaElement implements URLUtils;
 
 interface HTMLTableElement : HTMLElement {
-           attribute HTMLTableCaptionElement? caption;
+  attribute HTMLTableCaptionElement? caption;
   HTMLElement createCaption();
   void deleteCaption();
-           attribute HTMLTableSectionElement? tHead;
+  attribute HTMLTableSectionElement? tHead;
   HTMLElement createTHead();
   void deleteTHead();
-           attribute HTMLTableSectionElement? tFoot;
+  attribute HTMLTableSectionElement? tFoot;
   HTMLElement createTFoot();
   void deleteTFoot();
   readonly attribute HTMLCollection tBodies;
@@ -651,7 +667,7 @@ interface HTMLTableElement : HTMLElement {
   readonly attribute HTMLCollection rows;
   HTMLElement insertRow(optional long index = -1);
   void deleteRow(long index);
-           attribute boolean sortable;
+  attribute boolean sortable;
   void stopSorting();
 
   // also has obsolete members
@@ -662,7 +678,7 @@ interface HTMLTableCaptionElement : HTMLElement {
 };
 
 interface HTMLTableColElement : HTMLElement {
-           attribute unsigned long span;
+  attribute unsigned long span;
 
   // also has obsolete members
 };
@@ -690,15 +706,15 @@ interface HTMLTableDataCellElement : HTMLTableCellElement {
 };
 
 interface HTMLTableHeaderCellElement : HTMLTableCellElement {
-           attribute DOMString scope;
-           attribute DOMString abbr;
-           attribute DOMString sorted;
+  attribute DOMString scope;
+  attribute DOMString abbr;
+  attribute DOMString sorted;
   void sort();
 };
 
 interface HTMLTableCellElement : HTMLElement {
-           attribute unsigned long colSpan;
-           attribute unsigned long rowSpan;
+  attribute unsigned long colSpan;
+  attribute unsigned long rowSpan;
   [PutForwards=value] readonly attribute DOMSettableTokenList headers;
   readonly attribute long cellIndex;
 
@@ -707,15 +723,15 @@ interface HTMLTableCellElement : HTMLElement {
 
 [OverrideBuiltins]
 interface HTMLFormElement : HTMLElement {
-           attribute DOMString acceptCharset;
-           attribute DOMString action;
-           attribute DOMString autocomplete;
-           attribute DOMString enctype;
-           attribute DOMString encoding;
-           attribute DOMString method;
-           attribute DOMString name;
-           attribute boolean noValidate;
-           attribute DOMString target;
+  attribute DOMString acceptCharset;
+  attribute DOMString action;
+  attribute DOMString autocomplete;
+  attribute DOMString enctype;
+  attribute DOMString encoding;
+  attribute DOMString method;
+  attribute DOMString name;
+  attribute boolean noValidate;
+  attribute DOMString target;
 
   readonly attribute HTMLFormControlsCollection elements;
   readonly attribute long length;
@@ -732,51 +748,51 @@ interface HTMLFormElement : HTMLElement {
 
 interface HTMLLabelElement : HTMLElement {
   readonly attribute HTMLFormElement? form;
-           attribute DOMString htmlFor;
+  attribute DOMString htmlFor;
   readonly attribute HTMLElement? control;
 };
 
 interface HTMLInputElement : HTMLElement {
-           attribute DOMString accept;
-           attribute DOMString alt;
-           attribute DOMString autocomplete;
-           attribute boolean autofocus;
-           attribute boolean defaultChecked;
-           attribute boolean checked;
-           attribute DOMString dirName;
-           attribute boolean disabled;
+  attribute DOMString accept;
+  attribute DOMString alt;
+  attribute DOMString autocomplete;
+  attribute boolean autofocus;
+  attribute boolean defaultChecked;
+  attribute boolean checked;
+  attribute DOMString dirName;
+  attribute boolean disabled;
   readonly attribute HTMLFormElement? form;
   readonly attribute FileList? files;
-           attribute DOMString formAction;
-           attribute DOMString formEnctype;
-           attribute DOMString formMethod;
-           attribute boolean formNoValidate;
-           attribute DOMString formTarget;
-           attribute unsigned long height;
-           attribute boolean indeterminate;
-           attribute DOMString inputMode;
+  attribute DOMString formAction;
+  attribute DOMString formEnctype;
+  attribute DOMString formMethod;
+  attribute boolean formNoValidate;
+  attribute DOMString formTarget;
+  attribute unsigned long height;
+  attribute boolean indeterminate;
+  attribute DOMString inputMode;
   readonly attribute HTMLElement? list;
-           attribute DOMString max;
-           attribute long maxLength;
-           attribute DOMString min;
-           attribute long minLength;
-           attribute boolean multiple;
-           attribute DOMString name;
-           attribute DOMString pattern;
-           attribute DOMString placeholder;
-           attribute boolean readOnly;
-           attribute boolean required;
-           attribute unsigned long size;
-           attribute DOMString src;
-           attribute DOMString step;
-           attribute DOMString type;
-           attribute DOMString defaultValue;
+  attribute DOMString max;
+  attribute long maxLength;
+  attribute DOMString min;
+  attribute long minLength;
+  attribute boolean multiple;
+  attribute DOMString name;
+  attribute DOMString pattern;
+  attribute DOMString placeholder;
+  attribute boolean readOnly;
+  attribute boolean required;
+  attribute unsigned long size;
+  attribute DOMString src;
+  attribute DOMString step;
+  attribute DOMString type;
+  attribute DOMString defaultValue;
   [TreatNullAs=EmptyString] attribute DOMString value;
-           attribute Date? valueAsDate;
-           attribute unrestricted double valueAsNumber;
-           attribute double valueLow;
-           attribute double valueHigh;
-           attribute unsigned long width;
+  attribute Date? valueAsDate;
+  attribute unrestricted double valueAsNumber;
+  attribute double valueLow;
+  attribute double valueHigh;
+  attribute unsigned long width;
 
   void stepUp(optional long n = 1);
   void stepDown(optional long n = 1);
@@ -791,9 +807,9 @@ interface HTMLInputElement : HTMLElement {
   readonly attribute NodeList labels;
 
   void select();
-           attribute unsigned long selectionStart;
-           attribute unsigned long selectionEnd;
-           attribute DOMString selectionDirection;
+  attribute unsigned long selectionStart;
+  attribute unsigned long selectionEnd;
+  attribute DOMString selectionDirection;
   void setRangeText(DOMString replacement);
   void setRangeText(DOMString replacement, unsigned long start, unsigned long end, optional SelectionMode selectionMode = "preserve");
   void setSelectionRange(unsigned long start, unsigned long end, optional DOMString direction);
@@ -802,18 +818,18 @@ interface HTMLInputElement : HTMLElement {
 };
 
 interface HTMLButtonElement : HTMLElement {
-           attribute boolean autofocus;
-           attribute boolean disabled;
+  attribute boolean autofocus;
+  attribute boolean disabled;
   readonly attribute HTMLFormElement? form;
-           attribute DOMString formAction;
-           attribute DOMString formEnctype;
-           attribute DOMString formMethod;
-           attribute boolean formNoValidate;
-           attribute DOMString formTarget;
-           attribute DOMString name;
-           attribute DOMString type;
-           attribute DOMString value;
-           attribute HTMLMenuElement? menu;
+  attribute DOMString formAction;
+  attribute DOMString formEnctype;
+  attribute DOMString formMethod;
+  attribute boolean formNoValidate;
+  attribute DOMString formTarget;
+  attribute DOMString name;
+  attribute DOMString type;
+  attribute DOMString value;
+  attribute HTMLMenuElement? menu;
 
   readonly attribute boolean willValidate;
   readonly attribute ValidityState validity;
@@ -826,19 +842,19 @@ interface HTMLButtonElement : HTMLElement {
 };
 
 interface HTMLSelectElement : HTMLElement {
-           attribute DOMString autocomplete;
-           attribute boolean autofocus;
-           attribute boolean disabled;
+  attribute DOMString autocomplete;
+  attribute boolean autofocus;
+  attribute boolean disabled;
   readonly attribute HTMLFormElement? form;
-           attribute boolean multiple;
-           attribute DOMString name;
-           attribute boolean required;
-           attribute unsigned long size;
+  attribute boolean multiple;
+  attribute DOMString name;
+  attribute boolean required;
+  attribute unsigned long size;
 
   readonly attribute DOMString type;
 
   readonly attribute HTMLOptionsCollection options;
-           attribute unsigned long length;
+  attribute unsigned long length;
   getter Element? item(unsigned long index);
   HTMLOptionElement? namedItem(DOMString name);
   void add((HTMLOptionElement or HTMLOptGroupElement) element, optional (HTMLElement or long)? before = null);
@@ -847,8 +863,8 @@ interface HTMLSelectElement : HTMLElement {
   setter creator void (unsigned long index, HTMLOptionElement? option);
 
   readonly attribute HTMLCollection selectedOptions;
-           attribute long selectedIndex;
-           attribute DOMString value;
+  attribute long selectedIndex;
+  attribute DOMString value;
 
   readonly attribute boolean willValidate;
   readonly attribute ValidityState validity;
@@ -865,42 +881,42 @@ interface HTMLDataListElement : HTMLElement {
 };
 
 interface HTMLOptGroupElement : HTMLElement {
-           attribute boolean disabled;
-           attribute DOMString label;
+  attribute boolean disabled;
+  attribute DOMString label;
 };
 
 [NamedConstructor=Option(optional DOMString text = "", optional DOMString value, optional boolean defaultSelected = false, optional boolean selected = false)]
 interface HTMLOptionElement : HTMLElement {
-           attribute boolean disabled;
+  attribute boolean disabled;
   readonly attribute HTMLFormElement? form;
-           attribute DOMString label;
-           attribute boolean defaultSelected;
-           attribute boolean selected;
-           attribute DOMString value;
+  attribute DOMString label;
+  attribute boolean defaultSelected;
+  attribute boolean selected;
+  attribute DOMString value;
 
-           attribute DOMString text;
+  attribute DOMString text;
   readonly attribute long index;
 };
 
 interface HTMLTextAreaElement : HTMLElement {
-           attribute DOMString autocomplete;
-           attribute boolean autofocus;
-           attribute unsigned long cols;
-           attribute DOMString dirName;
-           attribute boolean disabled;
+  attribute DOMString autocomplete;
+  attribute boolean autofocus;
+  attribute unsigned long cols;
+  attribute DOMString dirName;
+  attribute boolean disabled;
   readonly attribute HTMLFormElement? form;
-           attribute DOMString inputMode;
-           attribute long maxLength;
-           attribute long minLength;
-           attribute DOMString name;
-           attribute DOMString placeholder;
-           attribute boolean readOnly;
-           attribute boolean required;
-           attribute unsigned long rows;
-           attribute DOMString wrap;
+  attribute DOMString inputMode;
+  attribute long maxLength;
+  attribute long minLength;
+  attribute DOMString name;
+  attribute DOMString placeholder;
+  attribute boolean readOnly;
+  attribute boolean required;
+  attribute unsigned long rows;
+  attribute DOMString wrap;
 
   readonly attribute DOMString type;
-           attribute DOMString defaultValue;
+  attribute DOMString defaultValue;
   [TreatNullAs=EmptyString] attribute DOMString value;
   readonly attribute unsigned long textLength;
 
@@ -914,21 +930,21 @@ interface HTMLTextAreaElement : HTMLElement {
   readonly attribute NodeList labels;
 
   void select();
-           attribute unsigned long selectionStart;
-           attribute unsigned long selectionEnd;
-           attribute DOMString selectionDirection;
+  attribute unsigned long selectionStart;
+  attribute unsigned long selectionEnd;
+  attribute DOMString selectionDirection;
   void setRangeText(DOMString replacement);
   void setRangeText(DOMString replacement, unsigned long start, unsigned long end, optional SelectionMode selectionMode = "preserve");
   void setSelectionRange(unsigned long start, unsigned long end, optional DOMString direction);
 };
 
 interface HTMLKeygenElement : HTMLElement {
-           attribute boolean autofocus;
-           attribute DOMString challenge;
-           attribute boolean disabled;
+  attribute boolean autofocus;
+  attribute DOMString challenge;
+  attribute boolean disabled;
   readonly attribute HTMLFormElement? form;
-           attribute DOMString keytype;
-           attribute DOMString name;
+  attribute DOMString keytype;
+  attribute DOMString name;
 
   readonly attribute DOMString type;
 
@@ -945,11 +961,11 @@ interface HTMLKeygenElement : HTMLElement {
 interface HTMLOutputElement : HTMLElement {
   [PutForwards=value] readonly attribute DOMSettableTokenList htmlFor;
   readonly attribute HTMLFormElement? form;
-           attribute DOMString name;
+  attribute DOMString name;
 
   readonly attribute DOMString type;
-           attribute DOMString defaultValue;
-           attribute DOMString value;
+  attribute DOMString defaultValue;
+  attribute DOMString value;
 
   readonly attribute boolean willValidate;
   readonly attribute ValidityState validity;
@@ -962,33 +978,33 @@ interface HTMLOutputElement : HTMLElement {
 };
 
 interface HTMLProgressElement : HTMLElement {
-           attribute double value;
-           attribute double max;
+  attribute double value;
+  attribute double max;
   readonly attribute double position;
   readonly attribute NodeList labels;
 };
 
 interface HTMLMeterElement : HTMLElement {
-           attribute double value;
-           attribute double min;
-           attribute double max;
-           attribute double low;
-           attribute double high;
-           attribute double optimum;
+  attribute double value;
+  attribute double min;
+  attribute double max;
+  attribute double low;
+  attribute double high;
+  attribute double optimum;
   readonly attribute NodeList labels;
 };
 
 interface HTMLFieldSetElement : HTMLElement {
-           attribute boolean disabled;
+  attribute boolean disabled;
   readonly attribute HTMLFormElement? form;
-           attribute DOMString name;
+  attribute DOMString name;
 
   readonly attribute DOMString type;
 
   readonly attribute HTMLFormControlsCollection elements;
 
   readonly attribute boolean willValidate;
-  readonly attribute ValidityState validity;
+  [SameObject] readonly attribute ValidityState validity;
   readonly attribute DOMString validationMessage;
   boolean checkValidity();
   boolean reportValidity();
@@ -1012,6 +1028,7 @@ dictionary AutocompleteErrorEventInit : EventInit {
   AutocompleteErrorReason reason;
 };
 
+
 enum SelectionMode {
   "select",
   "start",
@@ -1034,24 +1051,24 @@ interface ValidityState {
 };
 
 interface HTMLDetailsElement : HTMLElement {
-           attribute boolean open;
+  attribute boolean open;
 };
 
 interface HTMLMenuElement : HTMLElement {
-           attribute DOMString type;
-           attribute DOMString label;
+  attribute DOMString type;
+  attribute DOMString label;
 
   // also has obsolete members
 };
 
 interface HTMLMenuItemElement : HTMLElement {
-           attribute DOMString type;
-           attribute DOMString label;
-           attribute DOMString icon;
-           attribute boolean disabled;
-           attribute boolean checked;
-           attribute DOMString radiogroup;
-           attribute boolean default;
+  attribute DOMString type;
+  attribute DOMString label;
+  attribute DOMString icon;
+  attribute boolean disabled;
+  attribute boolean checked;
+  attribute DOMString radiogroup;
+  attribute boolean default;
   readonly attribute HTMLElement? command;
 };
 
@@ -1065,21 +1082,21 @@ dictionary RelatedEventInit : EventInit {
 };
 
 interface HTMLDialogElement : HTMLElement {
-           attribute boolean open;
-           attribute DOMString returnValue;
+  attribute boolean open;
+  attribute DOMString returnValue;
   void show(optional (MouseEvent or Element) anchor);
   void showModal(optional (MouseEvent or Element) anchor);
   void close(optional DOMString returnValue);
 };
 
 interface HTMLScriptElement : HTMLElement {
-           attribute DOMString src;
-           attribute DOMString type;
-           attribute DOMString charset;
-           attribute boolean async;
-           attribute boolean defer;
-           attribute DOMString crossOrigin;
-           attribute DOMString text;
+  attribute DOMString src;
+  attribute DOMString type;
+  attribute DOMString charset;
+  attribute boolean async;
+  attribute boolean defer;
+  attribute DOMString? crossOrigin;
+  attribute DOMString text;
 
   // also has obsolete members
 };
@@ -1091,8 +1108,8 @@ interface HTMLTemplateElement : HTMLElement {
 typedef (CanvasRenderingContext2D or WebGLRenderingContext) RenderingContext;
 
 interface HTMLCanvasElement : HTMLElement {
-           attribute unsigned long width;
-           attribute unsigned long height;
+  attribute unsigned long width;
+  attribute unsigned long height;
 
   RenderingContext? getContext(DOMString contextId, any... arguments);
   boolean probablySupportsContext(DOMString contextId, any... arguments);
@@ -1104,7 +1121,7 @@ interface HTMLCanvasElement : HTMLElement {
   void toBlob(FileCallback? _callback, optional DOMString type, any... arguments);
 };
 
-[Exposed=Window,Worker]
+[Exposed=(Window,Worker)]
 interface CanvasProxy {
   void setContext(RenderingContext context);
 };
@@ -1118,15 +1135,18 @@ typedef (HTMLImageElement or
 
 enum CanvasFillRule { "nonzero", "evenodd" };
 
-[Constructor(optional unsigned long width, unsigned long height), Exposed=Window,Worker]
+
+[Constructor(),
+ Constructor(unsigned long width, unsigned long height),
+ Exposed=(Window,Worker)]
 interface CanvasRenderingContext2D {
 
   // back-reference to the canvas
   readonly attribute HTMLCanvasElement canvas;
 
   // canvas dimensions
-           attribute unsigned long width;
-           attribute unsigned long height;
+  attribute unsigned long width;
+  attribute unsigned long height;
 
   // for contexts that aren't directly fixed to a specific canvas
   void commit(); // push the image to the output bitmap
@@ -1136,7 +1156,7 @@ interface CanvasRenderingContext2D {
   void restore(); // pop state stack and restore state
 
   // transformations (default transform is the identity matrix)
-           attribute SVGMatrix currentTransform;
+  attribute SVGMatrix currentTransform;
   void scale(unrestricted double x, unrestricted double y);
   void rotate(unrestricted double angle);
   void translate(unrestricted double x, unrestricted double y);
@@ -1145,24 +1165,24 @@ interface CanvasRenderingContext2D {
   void resetTransform();
 
   // compositing
-           attribute unrestricted double globalAlpha; // (default 1.0)
-           attribute DOMString globalCompositeOperation; // (default source-over)
+  attribute unrestricted double globalAlpha; // (default 1.0)
+  attribute DOMString globalCompositeOperation; // (default source-over)
 
   // image smoothing
-           attribute boolean imageSmoothingEnabled; // (default true)
+  attribute boolean imageSmoothingEnabled; // (default true)
 
-  // colors and styles (see also the CanvasDrawingStyles interface)
-           attribute (DOMString or CanvasGradient or CanvasPattern) strokeStyle; // (default black)
-           attribute (DOMString or CanvasGradient or CanvasPattern) fillStyle; // (default black)
+  // colours and styles (see also the CanvasDrawingStyles interface)
+  attribute (DOMString or CanvasGradient or CanvasPattern) strokeStyle; // (default black)
+  attribute (DOMString or CanvasGradient or CanvasPattern) fillStyle; // (default black)
   CanvasGradient createLinearGradient(double x0, double y0, double x1, double y1);
   CanvasGradient createRadialGradient(double x0, double y0, double r0, double x1, double y1, double r1);
   CanvasPattern createPattern(CanvasImageSource image, [TreatNullAs=EmptyString] DOMString repetition);
 
   // shadows
-           attribute unrestricted double shadowOffsetX; // (default 0)
-           attribute unrestricted double shadowOffsetY; // (default 0)
-           attribute unrestricted double shadowBlur; // (default 0)
-           attribute DOMString shadowColor; // (default transparent black)
+  attribute unrestricted double shadowOffsetX; // (default 0)
+  attribute unrestricted double shadowOffsetY; // (default 0)
+  attribute unrestricted double shadowBlur; // (default 0)
+  attribute DOMString shadowColor; // (default transparent black)
 
   // rects
   void clearRect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
@@ -1175,10 +1195,8 @@ interface CanvasRenderingContext2D {
   void fill(Path2D path, optional CanvasFillRule fillRule = "nonzero");
   void stroke();
   void stroke(Path2D path);
-  void drawSystemFocusRing(Element element);
-  void drawSystemFocusRing(Path2D path, Element element);
-  boolean drawCustomFocusRing(Element element);
-  boolean drawCustomFocusRing(Path2D path, Element element);
+  void drawFocusIfNeeded(Element element);
+  void drawFocusIfNeeded(Path2D path, Element element);
   void scrollPathIntoView();
   void scrollPathIntoView(Path2D path);
   void clip(optional CanvasFillRule fillRule = "nonzero");
@@ -1202,6 +1220,7 @@ interface CanvasRenderingContext2D {
   // hit regions
   void addHitRegion(optional HitRegionOptions options);
   void removeHitRegion(DOMString id);
+  void clearHitRegions();
 
   // pixel manipulation
   ImageData createImageData(double sw, double sh);
@@ -1213,27 +1232,27 @@ interface CanvasRenderingContext2D {
 CanvasRenderingContext2D implements CanvasDrawingStyles;
 CanvasRenderingContext2D implements CanvasPathMethods;
 
-[NoInterfaceObject, Exposed=Window,Worker]
+[NoInterfaceObject, Exposed=(Window,Worker)]
 interface CanvasDrawingStyles {
   // line caps/joins
-           attribute unrestricted double lineWidth; // (default 1)
-           attribute DOMString lineCap; // "butt", "round", "square" (default "butt")
-           attribute DOMString lineJoin; // "round", "bevel", "miter" (default "miter")
-           attribute unrestricted double miterLimit; // (default 10)
+  attribute unrestricted double lineWidth; // (default 1)
+  attribute DOMString lineCap; // "butt", "round", "square" (default "butt")
+  attribute DOMString lineJoin; // "round", "bevel", "miter" (default "miter")
+  attribute unrestricted double miterLimit; // (default 10)
 
   // dashed lines
   void setLineDash(sequence<unrestricted double> segments); // default empty
   sequence<unrestricted double> getLineDash();
-           attribute unrestricted double lineDashOffset;
+  attribute unrestricted double lineDashOffset;
 
   // text
-           attribute DOMString font; // (default 10px sans-serif)
-           attribute DOMString textAlign; // "start", "end", "left", "right", "center" (default: "start")
-           attribute DOMString textBaseline; // "top", "hanging", "middle", "alphabetic", "ideographic", "bottom" (default: "alphabetic")
-           attribute DOMString direction; // "ltr", "rtl", "inherit" (default: "inherit")
+  attribute DOMString font; // (default 10px sans-serif)
+  attribute DOMString textAlign; // "start", "end", "left", "right", "center" (default: "start")
+  attribute DOMString textBaseline; // "top", "hanging", "middle", "alphabetic", "ideographic", "bottom" (default: "alphabetic")
+  attribute DOMString direction; // "ltr", "rtl", "inherit" (default: "inherit")
 };
 
-[NoInterfaceObject, Exposed=Window,Worker]
+[NoInterfaceObject, Exposed=(Window,Worker)]
 interface CanvasPathMethods {
   // shared path API methods
   void closePath();
@@ -1241,26 +1260,26 @@ interface CanvasPathMethods {
   void lineTo(unrestricted double x, unrestricted double y);
   void quadraticCurveTo(unrestricted double cpx, unrestricted double cpy, unrestricted double x, unrestricted double y);
   void bezierCurveTo(unrestricted double cp1x, unrestricted double cp1y, unrestricted double cp2x, unrestricted double cp2y, unrestricted double x, unrestricted double y);
-  void arcTo(unrestricted double x1, unrestricted double y1, unrestricted double x2, unrestricted double y2, unrestricted double radius);
-  void arcTo(unrestricted double x1, unrestricted double y1, unrestricted double x2, unrestricted double y2, unrestricted double radiusX, unrestricted double radiusY, unrestricted double rotation);
+  void arcTo(unrestricted double x1, unrestricted double y1, unrestricted double x2, unrestricted double y2, unrestricted double radius); 
+  void arcTo(unrestricted double x1, unrestricted double y1, unrestricted double x2, unrestricted double y2, unrestricted double radiusX, unrestricted double radiusY, unrestricted double rotation); 
   void rect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
-  void arc(unrestricted double x, unrestricted double y, unrestricted double radius, unrestricted double startAngle, unrestricted double endAngle, optional boolean anticlockwise = false);
-  void ellipse(unrestricted double x, unrestricted double y, unrestricted double radiusX, unrestricted double radiusY, unrestricted double rotation, unrestricted double startAngle, unrestricted double endAngle, optional boolean anticlockwise = false);
+  void arc(unrestricted double x, unrestricted double y, unrestricted double radius, unrestricted double startAngle, unrestricted double endAngle, optional boolean anticlockwise = false); 
+  void ellipse(unrestricted double x, unrestricted double y, unrestricted double radiusX, unrestricted double radiusY, unrestricted double rotation, unrestricted double startAngle, unrestricted double endAngle, optional boolean anticlockwise = false); 
 };
 
-[Exposed=Window,Worker]
+[Exposed=(Window,Worker)]
 interface CanvasGradient {
   // opaque object
   void addColorStop(double offset, DOMString color);
 };
 
-[Exposed=Window,Worker]
+[Exposed=(Window,Worker)]
 interface CanvasPattern {
   // opaque object
   void setTransform(SVGMatrix transform);
 };
 
-[Exposed=Window,Worker]
+[Exposed=(Window,Worker)]
 interface TextMetrics {
   // x-direction
   readonly attribute double width; // advance width
@@ -1282,7 +1301,7 @@ interface TextMetrics {
 dictionary HitRegionOptions {
   Path2D? path = null;
   CanvasFillRule fillRule = "nonzero";
-  DOMString id = "";
+  DOMString id = ""; 
   DOMString? parentID = null;
   DOMString cursor = "inherit";
   // for control-backed regions:
@@ -1294,21 +1313,21 @@ dictionary HitRegionOptions {
 
 [Constructor(unsigned long sw, unsigned long sh),
  Constructor(Uint8ClampedArray data, unsigned long sw, optional unsigned long sh),
- Exposed=Window,Worker]
+ Exposed=(Window,Worker)]
 interface ImageData {
   readonly attribute unsigned long width;
   readonly attribute unsigned long height;
   readonly attribute Uint8ClampedArray data;
 };
 
-[Constructor(optional Element scope), Exposed=Window,Worker]
+[Constructor(optional Element scope), Exposed=(Window,Worker)]
 interface DrawingStyle { };
 DrawingStyle implements CanvasDrawingStyles;
 
 [Constructor,
  Constructor(Path2D path),
  Constructor(Path2D[] paths, optional CanvasFillRule fillRule = "nonzero"),
- Constructor(DOMString d), Exposed=Window,Worker]
+ Constructor(DOMString d), Exposed=(Window,Worker)]
 interface Path2D {
   void addPath(Path2D path, optional SVGMatrix? transformation = null);
   void addPathByStrokingPath(Path2D path, CanvasDrawingStyles styles, optional SVGMatrix? transformation = null);
@@ -1331,20 +1350,26 @@ partial interface Touch {
   readonly attribute DOMString? region;
 };
 
+[NoInterfaceObject]
+interface ElementContentEditable {
+  attribute DOMString contentEditable;
+  readonly attribute boolean isContentEditable;
+};
+
 interface DataTransfer {
-           attribute DOMString dropEffect;
-           attribute DOMString effectAllowed;
+  attribute DOMString dropEffect;
+  attribute DOMString effectAllowed;
 
-  readonly attribute DataTransferItemList items;
+  [SameObject] readonly attribute DataTransferItemList items;
 
   void setDragImage(Element image, long x, long y);
 
   /* old interface */
-  readonly attribute DOMString[] types;
+  [SameObject] readonly attribute DOMString[] types;
   DOMString getData(DOMString format);
   void setData(DOMString format, DOMString data);
   void clearData(optional DOMString format);
-  readonly attribute FileList files;
+  [SameObject] readonly attribute FileList files;
 };
 
 interface DataTransferItemList {
@@ -1374,13 +1399,13 @@ dictionary DragEventInit : MouseEventInit {
   DataTransfer? dataTransfer;
 };
 
-[PrimaryGlobal]
+[PrimaryGlobal] 
 /*sealed*/ interface Window : EventTarget {
   // the current browsing context
   [Unforgeable] readonly attribute WindowProxy window;
   [Replaceable] readonly attribute WindowProxy self;
   [Unforgeable] readonly attribute Document document;
-           attribute DOMString name;
+  attribute DOMString name; 
   [PutForwards=href, Unforgeable] readonly attribute Location location;
   readonly attribute History history;
   [Replaceable] readonly attribute BarProp locationbar;
@@ -1389,7 +1414,7 @@ dictionary DragEventInit : MouseEventInit {
   [Replaceable] readonly attribute BarProp scrollbars;
   [Replaceable] readonly attribute BarProp statusbar;
   [Replaceable] readonly attribute BarProp toolbar;
-           attribute DOMString status;
+  attribute DOMString status;
   void close();
   readonly attribute boolean closed;
   void stop();
@@ -1400,16 +1425,16 @@ dictionary DragEventInit : MouseEventInit {
   [Replaceable] readonly attribute WindowProxy frames;
   [Replaceable] readonly attribute unsigned long length;
   [Unforgeable] readonly attribute WindowProxy top;
-           attribute any opener;
-  readonly attribute WindowProxy parent;
+  attribute any opener;
+  [Replaceable] readonly attribute WindowProxy parent;
   readonly attribute Element? frameElement;
-  WindowProxy open(optional DOMString url = "about:blank", optional DOMString target = "_blank", optional DOMString features = "", optional boolean replace = false);
+  WindowProxy open(optional DOMString url = "about:blank", optional DOMString target = "_blank", [TreatNullAs=EmptyString] optional DOMString features = "", optional boolean replace = false);
   getter WindowProxy (unsigned long index);
   getter object (DOMString name);
 
   // the user agent
-  readonly attribute Navigator navigator;
-  [Replaceable] readonly attribute External external;
+  readonly attribute Navigator navigator; 
+  [Replaceable, SameObject] readonly attribute External external;
   readonly attribute ApplicationCache applicationCache;
 
   // user prompts
@@ -1418,7 +1443,10 @@ dictionary DragEventInit : MouseEventInit {
   boolean confirm(optional DOMString message = "");
   DOMString? prompt(optional DOMString message = "", optional DOMString default = "");
   void print();
-  any showModalDialog(DOMString url, optional any argument);
+  any showModalDialog(DOMString url, optional any argument); // deprecated
+
+  long requestAnimationFrame(FrameRequestCallback callback);
+  void cancelAnimationFrame(long handle);
 
   void postMessage(any message, DOMString targetOrigin, optional sequence<Transferable> transfer);
 
@@ -1428,7 +1456,7 @@ Window implements GlobalEventHandlers;
 Window implements WindowEventHandlers;
 
 interface BarProp {
-           attribute boolean visible;
+  attribute boolean visible;
 };
 
 interface History {
@@ -1448,7 +1476,7 @@ interface History {
 };
 Location implements URLUtils;
 
-[Constructor(DOMString type, optional PopStateEventInit eventInitDict), Exposed=Window,Worker]
+[Constructor(DOMString type, optional PopStateEventInit eventInitDict), Exposed=(Window,Worker)]
 interface PopStateEvent : Event {
   readonly attribute any state;
 };
@@ -1457,7 +1485,7 @@ dictionary PopStateEventInit : EventInit {
   any state;
 };
 
-[Constructor(DOMString type, optional HashChangeEventInit eventInitDict), Exposed=Window,Worker]
+[Constructor(DOMString type, optional HashChangeEventInit eventInitDict), Exposed=(Window,Worker)]
 interface HashChangeEvent : Event {
   readonly attribute DOMString oldURL;
   readonly attribute DOMString newURL;
@@ -1468,7 +1496,7 @@ dictionary HashChangeEventInit : EventInit {
   DOMString newURL;
 };
 
-[Constructor(DOMString type, optional PageTransitionEventInit eventInitDict), Exposed=Window,Worker]
+[Constructor(DOMString type, optional PageTransitionEventInit eventInitDict), Exposed=(Window,Worker)]
 interface PageTransitionEvent : Event {
   readonly attribute boolean persisted;
 };
@@ -1478,10 +1506,10 @@ dictionary PageTransitionEventInit : EventInit {
 };
 
 interface BeforeUnloadEvent : Event {
-           attribute DOMString returnValue;
+  attribute DOMString returnValue;
 };
 
-[Exposed=Window,SharedWorker]
+[Exposed=(Window,SharedWorker)]
 interface ApplicationCache : EventTarget {
 
   // update status
@@ -1499,22 +1527,22 @@ interface ApplicationCache : EventTarget {
   void swapCache();
 
   // events
-           attribute EventHandler onchecking;
-           attribute EventHandler onerror;
-           attribute EventHandler onnoupdate;
-           attribute EventHandler ondownloading;
-           attribute EventHandler onprogress;
-           attribute EventHandler onupdateready;
-           attribute EventHandler oncached;
-           attribute EventHandler onobsolete;
+  attribute EventHandler onchecking;
+  attribute EventHandler onerror;
+  attribute EventHandler onnoupdate;
+  attribute EventHandler ondownloading;
+  attribute EventHandler onprogress;
+  attribute EventHandler onupdateready;
+  attribute EventHandler oncached;
+  attribute EventHandler onobsolete;
 };
 
-[NoInterfaceObject, Exposed=Window,Worker]
+[NoInterfaceObject, Exposed=(Window,Worker)]
 interface NavigatorOnLine {
   readonly attribute boolean onLine;
 };
 
-[Constructor(DOMString type, optional ErrorEventInit eventInitDict), Exposed=Window,Worker]
+[Constructor(DOMString type, optional ErrorEventInit eventInitDict), Exposed=(Window,Worker)]
 interface ErrorEvent : Event {
   readonly attribute DOMString message;
   readonly attribute DOMString filename;
@@ -1545,96 +1573,96 @@ typedef OnBeforeUnloadEventHandlerNonNull? OnBeforeUnloadEventHandler;
 
 [NoInterfaceObject]
 interface GlobalEventHandlers {
-           attribute EventHandler onabort;
-           attribute EventHandler onautocomplete;
-           attribute EventHandler onautocompleteerror;
-           attribute EventHandler onblur;
-           attribute EventHandler oncancel;
-           attribute EventHandler oncanplay;
-           attribute EventHandler oncanplaythrough;
-           attribute EventHandler onchange;
-           attribute EventHandler onclick;
-           attribute EventHandler onclose;
-           attribute EventHandler oncontextmenu;
-           attribute EventHandler oncuechange;
-           attribute EventHandler ondblclick;
-           attribute EventHandler ondrag;
-           attribute EventHandler ondragend;
-           attribute EventHandler ondragenter;
-           attribute EventHandler ondragexit;
-           attribute EventHandler ondragleave;
-           attribute EventHandler ondragover;
-           attribute EventHandler ondragstart;
-           attribute EventHandler ondrop;
-           attribute EventHandler ondurationchange;
-           attribute EventHandler onemptied;
-           attribute EventHandler onended;
-           attribute OnErrorEventHandler onerror;
-           attribute EventHandler onfocus;
-           attribute EventHandler oninput;
-           attribute EventHandler oninvalid;
-           attribute EventHandler onkeydown;
-           attribute EventHandler onkeypress;
-           attribute EventHandler onkeyup;
-           attribute EventHandler onload;
-           attribute EventHandler onloadeddata;
-           attribute EventHandler onloadedmetadata;
-           attribute EventHandler onloadstart;
-           attribute EventHandler onmousedown;
+  attribute EventHandler onabort;
+  attribute EventHandler onautocomplete;
+  attribute EventHandler onautocompleteerror;
+  attribute EventHandler onblur;
+  attribute EventHandler oncancel;
+  attribute EventHandler oncanplay;
+  attribute EventHandler oncanplaythrough;
+  attribute EventHandler onchange;
+  attribute EventHandler onclick;
+  attribute EventHandler onclose;
+  attribute EventHandler oncontextmenu;
+  attribute EventHandler oncuechange;
+  attribute EventHandler ondblclick;
+  attribute EventHandler ondrag;
+  attribute EventHandler ondragend;
+  attribute EventHandler ondragenter;
+  attribute EventHandler ondragexit;
+  attribute EventHandler ondragleave;
+  attribute EventHandler ondragover;
+  attribute EventHandler ondragstart;
+  attribute EventHandler ondrop;
+  attribute EventHandler ondurationchange;
+  attribute EventHandler onemptied;
+  attribute EventHandler onended;
+  attribute OnErrorEventHandler onerror;
+  attribute EventHandler onfocus;
+  attribute EventHandler oninput;
+  attribute EventHandler oninvalid;
+  attribute EventHandler onkeydown;
+  attribute EventHandler onkeypress;
+  attribute EventHandler onkeyup;
+  attribute EventHandler onload;
+  attribute EventHandler onloadeddata;
+  attribute EventHandler onloadedmetadata;
+  attribute EventHandler onloadstart;
+  attribute EventHandler onmousedown;
   [LenientThis] attribute EventHandler onmouseenter;
   [LenientThis] attribute EventHandler onmouseleave;
-           attribute EventHandler onmousemove;
-           attribute EventHandler onmouseout;
-           attribute EventHandler onmouseover;
-           attribute EventHandler onmouseup;
-           attribute EventHandler onmousewheel;
-           attribute EventHandler onpause;
-           attribute EventHandler onplay;
-           attribute EventHandler onplaying;
-           attribute EventHandler onprogress;
-           attribute EventHandler onratechange;
-           attribute EventHandler onreset;
-           attribute EventHandler onresize;
-           attribute EventHandler onscroll;
-           attribute EventHandler onseeked;
-           attribute EventHandler onseeking;
-           attribute EventHandler onselect;
-           attribute EventHandler onshow;
-           attribute EventHandler onsort;
-           attribute EventHandler onstalled;
-           attribute EventHandler onsubmit;
-           attribute EventHandler onsuspend;
-           attribute EventHandler ontimeupdate;
-           attribute EventHandler ontoggle;
-           attribute EventHandler onvolumechange;
-           attribute EventHandler onwaiting;
+  attribute EventHandler onmousemove;
+  attribute EventHandler onmouseout;
+  attribute EventHandler onmouseover;
+  attribute EventHandler onmouseup;
+  attribute EventHandler onmousewheel;
+  attribute EventHandler onpause;
+  attribute EventHandler onplay;
+  attribute EventHandler onplaying;
+  attribute EventHandler onprogress;
+  attribute EventHandler onratechange;
+  attribute EventHandler onreset;
+  attribute EventHandler onresize;
+  attribute EventHandler onscroll;
+  attribute EventHandler onseeked;
+  attribute EventHandler onseeking;
+  attribute EventHandler onselect;
+  attribute EventHandler onshow;
+  attribute EventHandler onsort;
+  attribute EventHandler onstalled;
+  attribute EventHandler onsubmit;
+  attribute EventHandler onsuspend;
+  attribute EventHandler ontimeupdate;
+  attribute EventHandler ontoggle;
+  attribute EventHandler onvolumechange;
+  attribute EventHandler onwaiting;
 };
 
 [NoInterfaceObject]
 interface WindowEventHandlers {
-           attribute EventHandler onafterprint;
-           attribute EventHandler onbeforeprint;
-           attribute OnBeforeUnloadEventHandler onbeforeunload;
-           attribute EventHandler onhashchange;
-           attribute EventHandler onlanguagechange;
-           attribute EventHandler onmessage;
-           attribute EventHandler onoffline;
-           attribute EventHandler ononline;
-           attribute EventHandler onpagehide;
-           attribute EventHandler onpageshow;
-           attribute EventHandler onpopstate;
-           attribute EventHandler onstorage;
-           attribute EventHandler onunload;
-};
-
-[NoInterfaceObject, Exposed=Window,Worker]
+  attribute EventHandler onafterprint;
+  attribute EventHandler onbeforeprint;
+  attribute OnBeforeUnloadEventHandler onbeforeunload;
+  attribute EventHandler onhashchange;
+  attribute EventHandler onlanguagechange;
+  attribute EventHandler onmessage;
+  attribute EventHandler onoffline;
+  attribute EventHandler ononline;
+  attribute EventHandler onpagehide;
+  attribute EventHandler onpageshow;
+  attribute EventHandler onpopstate;
+  attribute EventHandler onstorage;
+  attribute EventHandler onunload;
+};
+
+[NoInterfaceObject, Exposed=(Window,Worker)]
 interface WindowBase64 {
   DOMString btoa(DOMString btoa);
   DOMString atob(DOMString atob);
 };
 Window implements WindowBase64;
 
-[NoInterfaceObject, Exposed=Window,Worker]
+[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);
@@ -1648,7 +1676,7 @@ Window implements WindowTimers;
 [NoInterfaceObject]
 interface WindowModal {
   readonly attribute any dialogArguments;
-           attribute any returnValue;
+  attribute any returnValue;
 };
 
 interface Navigator {
@@ -1661,7 +1689,7 @@ Navigator implements NavigatorContentUtils;
 Navigator implements NavigatorStorageUtils;
 Navigator implements NavigatorPlugins;
 
-[NoInterfaceObject, Exposed=Window,Worker]
+[NoInterfaceObject, Exposed=(Window,Worker)]
 interface NavigatorID {
   readonly attribute DOMString appCodeName; // constant "Mozilla"
   readonly attribute DOMString appName;
@@ -1672,7 +1700,7 @@ interface NavigatorID {
   readonly attribute DOMString userAgent;
 };
 
-[NoInterfaceObject, Exposed=Window,Worker]
+[NoInterfaceObject, Exposed=(Window,Worker)]
 interface NavigatorLanguage {
   readonly attribute DOMString? language;
   readonly attribute DOMString[] languages;
@@ -1697,8 +1725,8 @@ interface NavigatorStorageUtils {
 
 [NoInterfaceObject]
 interface NavigatorPlugins {
-  readonly attribute PluginArray plugins;
-  readonly attribute MimeTypeArray mimeTypes;
+  [SameObject] readonly attribute PluginArray plugins;
+  [SameObject] readonly attribute MimeTypeArray mimeTypes;
   readonly attribute boolean javaEnabled;
 };
 
@@ -1736,7 +1764,7 @@ interface External {
   unsigned long IsSearchProviderInstalled(DOMString engineURL);
 };
 
-[Exposed=Window,Worker]
+[Exposed=(Window,Worker)]
 interface ImageBitmap {
   readonly attribute unsigned long width;
   readonly attribute unsigned long height;
@@ -1750,32 +1778,34 @@ typedef (HTMLImageElement or
          CanvasRenderingContext2D or
          ImageBitmap) ImageBitmapSource;
 
-[NoInterfaceObject, Exposed=Window,Worker]
+[NoInterfaceObject, Exposed=(Window,Worker)]
 interface ImageBitmapFactories {
-  Promise createImageBitmap(ImageBitmapSource image, optional long sx, long sy, long sw, long sh);
+  Promise<ImageBitmap> createImageBitmap(ImageBitmapSource image);
+  Promise<ImageBitmap> createImageBitmap(ImageBitmapSource image, long sx, long sy, long sw, long sh);
 };
 Window implements ImageBitmapFactories;
 WorkerGlobalScope implements ImageBitmapFactories;
 
-[Constructor(DOMString type, optional MessageEventInit eventInitDict), Exposed=Window,Worker]
+[Constructor(DOMString type, optional MessageEventInit eventInitDict), Exposed=(Window,Worker)]
 interface MessageEvent : Event {
   readonly attribute any data;
   readonly attribute DOMString origin;
   readonly attribute DOMString lastEventId;
   readonly attribute (WindowProxy or MessagePort)? source;
   readonly attribute MessagePort[]? ports;
+
+  void initMessageEvent(DOMString typeArg, boolean canBubbleArg, boolean cancelableArg, any dataArg, DOMString originArg, DOMString lastEventIdArg, (WindowProxy or MessagePort) sourceArg, sequence<MessagePort>? portsArg);
 };
 
 dictionary MessageEventInit : EventInit {
   any data;
   DOMString origin;
   DOMString lastEventId;
-  DOMString channel;
   (WindowProxy or MessagePort)? source;
   sequence<MessagePort> ports;
 };
 
-[Constructor(DOMString url, optional EventSourceInit eventSourceInitDict), Exposed=Window,Worker]
+[Constructor(DOMString url, optional EventSourceInit eventSourceInitDict), Exposed=(Window,Worker)]
 interface EventSource : EventTarget {
   readonly attribute DOMString url;
   readonly attribute boolean withCredentials;
@@ -1787,9 +1817,9 @@ interface EventSource : EventTarget {
   readonly attribute unsigned short readyState;
 
   // networking
-           attribute EventHandler onopen;
-           attribute EventHandler onmessage;
-           attribute EventHandler onerror;
+  attribute EventHandler onopen;
+  attribute EventHandler onmessage;
+  attribute EventHandler onerror;
   void close();
 };
 
@@ -1798,7 +1828,7 @@ dictionary EventSourceInit {
 };
 
 enum BinaryType { "blob", "arraybuffer" };
-[Constructor(DOMString url, optional (DOMString or DOMString[]) protocols), Exposed=Window,Worker]
+[Constructor(DOMString url, optional (DOMString or DOMString[]) protocols), Exposed=(Window,Worker)]
 interface WebSocket : EventTarget {
   readonly attribute DOMString url;
 
@@ -1811,23 +1841,23 @@ interface WebSocket : EventTarget {
   readonly attribute unsigned long bufferedAmount;
 
   // networking
-           attribute EventHandler onopen;
-           attribute EventHandler onerror;
-           attribute EventHandler onclose;
+  attribute EventHandler onopen;
+  attribute EventHandler onerror;
+  attribute EventHandler onclose;
   readonly attribute DOMString extensions;
   readonly attribute DOMString protocol;
-  void close([Clamp] optional unsigned short code, optional DOMString reason);
+  void close([Clamp] optional unsigned short code, optional USVString reason);
 
   // messaging
-           attribute EventHandler onmessage;
-           attribute BinaryType binaryType;
-  void send(DOMString data);
+  attribute EventHandler onmessage;
+  attribute BinaryType binaryType;
+  void send(USVString data);
   void send(Blob data);
   void send(ArrayBuffer data);
   void send(ArrayBufferView data);
 };
 
-[Constructor(DOMString type, optional CloseEventInit eventInitDict), Exposed=Window,Worker]
+[Constructor(DOMString type, optional CloseEventInit eventInitDict), Exposed=(Window,Worker)]
 interface CloseEvent : Event {
   readonly attribute boolean wasClean;
   readonly attribute unsigned short code;
@@ -1840,24 +1870,24 @@ dictionary CloseEventInit : EventInit {
   DOMString reason;
 };
 
-[Constructor, Exposed=Window,Worker]
+[Constructor, Exposed=(Window,Worker)]
 interface MessageChannel {
   readonly attribute MessagePort port1;
   readonly attribute MessagePort port2;
 };
 
-[Exposed=Window,Worker]
+[Exposed=(Window,Worker)]
 interface MessagePort : EventTarget {
   void postMessage(any message, optional sequence<Transferable> transfer);
   void start();
   void close();
 
   // event handlers
-           attribute EventHandler onmessage;
+  attribute EventHandler onmessage;
 };
 // MessagePort implements Transferable;
 
-[Constructor, Exposed=Window,Worker]
+[Constructor, Exposed=(Window,Worker)]
 interface PortCollection {
   void add(MessagePort port);
   void remove(MessagePort port);
@@ -1867,63 +1897,63 @@ interface PortCollection {
 
 callback PortCollectionCallback = void (MessagePort port);
 
-[Constructor(DOMString channel), Exposed=Window,Worker]
+[Constructor(DOMString channel), Exposed=(Window,Worker)]
 interface BroadcastChannel : EventTarget {
   readonly attribute DOMString name;
   void postMessage(any message);
   void close();
-           attribute EventHandler onmessage;
+  attribute EventHandler onmessage;
 };
 
-[Exposed=Worker]
+[Exposed=Worker] 
 interface WorkerGlobalScope : EventTarget {
   readonly attribute WorkerGlobalScope self;
   readonly attribute WorkerLocation location;
 
   void close();
-           attribute OnErrorEventHandler onerror;
-           attribute EventHandler onlanguagechange;
-           attribute EventHandler onoffline;
-           attribute EventHandler ononline;
+  attribute OnErrorEventHandler onerror;
+  attribute EventHandler onlanguagechange;
+  attribute EventHandler onoffline;
+  attribute EventHandler ononline;
 
   // also has additional members in a partial interface
 };
 
-[Global=Worker,DedicatedWorker]
+[Global=(Worker,DedicatedWorker),Exposed=DedicatedWorker]
 /*sealed*/ interface DedicatedWorkerGlobalScope : WorkerGlobalScope {
   void postMessage(any message, optional sequence<Transferable> transfer);
-           attribute EventHandler onmessage;
+  attribute EventHandler onmessage;
 };
 
-[Global=Worker,SharedWorker]
+[Global=(Worker,SharedWorker),Exposed=SharedWorker]
 /*sealed*/ interface SharedWorkerGlobalScope : WorkerGlobalScope {
   readonly attribute DOMString name;
   readonly attribute ApplicationCache applicationCache;
-           attribute EventHandler onconnect;
+  attribute EventHandler onconnect;
 };
 
-[NoInterfaceObject, Exposed=Window,Worker]
+[NoInterfaceObject, Exposed=(Window,Worker)]
 interface AbstractWorker {
-           attribute EventHandler onerror;
+  attribute EventHandler onerror;
 };
 
-[Constructor(DOMString scriptURL), Exposed=Window,Worker]
+[Constructor(DOMString scriptURL), Exposed=(Window,Worker)]
 interface Worker : EventTarget {
   void terminate();
 
   void postMessage(any message, optional sequence<Transferable> transfer);
-           attribute EventHandler onmessage;
+  attribute EventHandler onmessage;
 };
 Worker implements AbstractWorker;
 
-[Constructor(DOMString scriptURL, optional DOMString name), Exposed=Window,Worker]
+[Constructor(DOMString scriptURL, optional DOMString name), Exposed=(Window,Worker)]
 interface SharedWorker : EventTarget {
   readonly attribute MessagePort port;
 };
 SharedWorker implements AbstractWorker;
 
 [Exposed=Worker]
-partial interface WorkerGlobalScope {
+partial interface WorkerGlobalScope { // not obsolete
   void importScripts(DOMString... urls);
   readonly attribute WorkerNavigator navigator;
 };
@@ -1979,53 +2009,53 @@ dictionary StorageEventInit : EventInit {
 };
 
 interface HTMLAppletElement : HTMLElement {
-           attribute DOMString align;
-           attribute DOMString alt;
-           attribute DOMString archive;
-           attribute DOMString code;
-           attribute DOMString codeBase;
-           attribute DOMString height;
-           attribute unsigned long hspace;
-           attribute DOMString name;
-           attribute DOMString _object; // the underscore is not part of the identifier
-           attribute unsigned long vspace;
-           attribute DOMString width;
+  attribute DOMString align;
+  attribute DOMString alt;
+  attribute DOMString archive;
+  attribute DOMString code;
+  attribute DOMString codeBase;
+  attribute DOMString height;
+  attribute unsigned long hspace;
+  attribute DOMString name;
+  attribute DOMString _object; // the underscore is not part of the identifier 
+  attribute unsigned long vspace;
+  attribute DOMString width;
 };
 
 interface HTMLMarqueeElement : HTMLElement {
-           attribute DOMString behavior;
-           attribute DOMString bgColor;
-           attribute DOMString direction;
-           attribute DOMString height;
-           attribute unsigned long hspace;
-           attribute long loop;
-           attribute unsigned long scrollAmount;
-           attribute unsigned long scrollDelay;
-           attribute boolean trueSpeed;
-           attribute unsigned long vspace;
-           attribute DOMString width;
-
-           attribute EventHandler onbounce;
-           attribute EventHandler onfinish;
-           attribute EventHandler onstart;
+  attribute DOMString behavior;
+  attribute DOMString bgColor;
+  attribute DOMString direction;
+  attribute DOMString height;
+  attribute unsigned long hspace;
+  attribute long loop;
+  attribute unsigned long scrollAmount;
+  attribute unsigned long scrollDelay;
+  attribute boolean trueSpeed;
+  attribute unsigned long vspace;
+  attribute DOMString width;
+
+  attribute EventHandler onbounce;
+  attribute EventHandler onfinish;
+  attribute EventHandler onstart;
 
   void start();
   void stop();
 };
 
 interface HTMLFrameSetElement : HTMLElement {
-           attribute DOMString cols;
-           attribute DOMString rows;
+  attribute DOMString cols;
+  attribute DOMString rows;
 };
 HTMLFrameSetElement implements WindowEventHandlers;
 
 interface HTMLFrameElement : HTMLElement {
-           attribute DOMString name;
-           attribute DOMString scrolling;
-           attribute DOMString src;
-           attribute DOMString frameBorder;
-           attribute DOMString longDesc;
-           attribute boolean noResize;
+  attribute DOMString name;
+  attribute DOMString scrolling;
+  attribute DOMString src;
+  attribute DOMString frameBorder;
+  attribute DOMString longDesc;
+  attribute boolean noResize;
   readonly attribute Document? contentDocument;
   readonly attribute WindowProxy? contentWindow;
 
@@ -2034,15 +2064,15 @@ interface HTMLFrameElement : HTMLElement {
 };
 
 partial interface HTMLAnchorElement {
-           attribute DOMString coords;
-           attribute DOMString charset;
-           attribute DOMString name;
-           attribute DOMString rev;
-           attribute DOMString shape;
+  attribute DOMString coords;
+  attribute DOMString charset;
+  attribute DOMString name;
+  attribute DOMString rev;
+  attribute DOMString shape;
 };
 
 partial interface HTMLAreaElement {
-           attribute boolean noHref;
+  attribute boolean noHref;
 };
 
 partial interface HTMLBodyElement {
@@ -2051,155 +2081,155 @@ partial interface HTMLBodyElement {
   [TreatNullAs=EmptyString] attribute DOMString vLink;
   [TreatNullAs=EmptyString] attribute DOMString aLink;
   [TreatNullAs=EmptyString] attribute DOMString bgColor;
-                            attribute DOMString background;
+                   attribute DOMString background;
 };
 
 partial interface HTMLBRElement {
-           attribute DOMString clear;
+  attribute DOMString clear;
 };
 
 partial interface HTMLTableCaptionElement {
-           attribute DOMString align;
+  attribute DOMString align;
 };
 
 partial interface HTMLTableColElement {
-           attribute DOMString align;
-           attribute DOMString ch;
-           attribute DOMString chOff;
-           attribute DOMString vAlign;
-           attribute DOMString width;
+  attribute DOMString align;
+  attribute DOMString ch;
+  attribute DOMString chOff;
+  attribute DOMString vAlign;
+  attribute DOMString width;
 };
 
 interface HTMLDirectoryElement : HTMLElement {
-           attribute boolean compact;
+  attribute boolean compact;
 };
 
 partial interface HTMLDivElement {
-           attribute DOMString align;
+  attribute DOMString align;
 };
 
 partial interface HTMLDListElement {
-           attribute boolean compact;
+  attribute boolean compact;
 };
 
 partial interface HTMLEmbedElement {
-           attribute DOMString align;
-           attribute DOMString name;
+  attribute DOMString align;
+  attribute DOMString name;
 };
 
 interface HTMLFontElement : HTMLElement {
   [TreatNullAs=EmptyString] attribute DOMString color;
-                            attribute DOMString face;
-                            attribute DOMString size;
+                   attribute DOMString face;
+                   attribute DOMString size; 
 };
 
 partial interface HTMLHeadingElement {
-           attribute DOMString align;
+  attribute DOMString align;
 };
 
 partial interface HTMLHRElement {
-           attribute DOMString align;
-           attribute DOMString color;
-           attribute boolean noShade;
-           attribute DOMString size;
-           attribute DOMString width;
+  attribute DOMString align;
+  attribute DOMString color;
+  attribute boolean noShade;
+  attribute DOMString size;
+  attribute DOMString width;
 };
 
 partial interface HTMLHtmlElement {
-           attribute DOMString version;
+  attribute DOMString version;
 };
 
 partial interface HTMLIFrameElement {
-           attribute DOMString align;
-           attribute DOMString scrolling;
-           attribute DOMString frameBorder;
-           attribute DOMString longDesc;
+  attribute DOMString align;
+  attribute DOMString scrolling;
+  attribute DOMString frameBorder;
+  attribute DOMString longDesc;
 
   [TreatNullAs=EmptyString] attribute DOMString marginHeight;
   [TreatNullAs=EmptyString] attribute DOMString marginWidth;
 };
 
 partial interface HTMLImageElement {
-           attribute DOMString name;
-           attribute DOMString lowsrc;
-           attribute DOMString align;
-           attribute unsigned long hspace;
-           attribute unsigned long vspace;
-           attribute DOMString longDesc;
+  attribute DOMString name;
+  attribute DOMString lowsrc;
+  attribute DOMString align;
+  attribute unsigned long hspace;
+  attribute unsigned long vspace;
+  attribute DOMString longDesc;
 
   [TreatNullAs=EmptyString] attribute DOMString border;
 };
 
 partial interface HTMLInputElement {
-           attribute DOMString align;
-           attribute DOMString useMap;
+  attribute DOMString align;
+  attribute DOMString useMap;
 };
 
 partial interface HTMLLegendElement {
-           attribute DOMString align;
+  attribute DOMString align;
 };
 
 partial interface HTMLLIElement {
-           attribute DOMString type;
+  attribute DOMString type;
 };
 
 partial interface HTMLLinkElement {
-           attribute DOMString charset;
-           attribute DOMString rev;
-           attribute DOMString target;
+  attribute DOMString charset;
+  attribute DOMString rev;
+  attribute DOMString target;
 };
 
 partial interface HTMLMenuElement {
-           attribute boolean compact;
+  attribute boolean compact;
 };
 
 partial interface HTMLMetaElement {
-           attribute DOMString scheme;
+  attribute DOMString scheme;
 };
 
 partial interface HTMLObjectElement {
-           attribute DOMString align;
-           attribute DOMString archive;
-           attribute DOMString code;
-           attribute boolean declare;
-           attribute unsigned long hspace;
-           attribute DOMString standby;
-           attribute unsigned long vspace;
-           attribute DOMString codeBase;
-           attribute DOMString codeType;
+  attribute DOMString align;
+  attribute DOMString archive;
+  attribute DOMString code;
+  attribute boolean declare;
+  attribute unsigned long hspace;
+  attribute DOMString standby;
+  attribute unsigned long vspace;
+  attribute DOMString codeBase;
+  attribute DOMString codeType;
 
   [TreatNullAs=EmptyString] attribute DOMString border;
 };
 
 partial interface HTMLOListElement {
-           attribute boolean compact;
+  attribute boolean compact;
 };
 
 partial interface HTMLParagraphElement {
-           attribute DOMString align;
+  attribute DOMString align;
 };
 
 partial interface HTMLParamElement {
-           attribute DOMString type;
-           attribute DOMString valueType;
+  attribute DOMString type;
+  attribute DOMString valueType;
 };
 
 partial interface HTMLPreElement {
-           attribute long width;
+  attribute long width;
 };
 
 partial interface HTMLScriptElement {
-           attribute DOMString event;
-           attribute DOMString htmlFor;
+  attribute DOMString event;
+  attribute DOMString htmlFor;
 };
 
 partial interface HTMLTableElement {
-           attribute DOMString align;
-           attribute DOMString border;
-           attribute DOMString frame;
-           attribute DOMString rules;
-           attribute DOMString summary;
-           attribute DOMString width;
+  attribute DOMString align;
+  attribute DOMString border;
+  attribute DOMString frame;
+  attribute DOMString rules;
+  attribute DOMString summary;
+  attribute DOMString width;
 
   [TreatNullAs=EmptyString] attribute DOMString bgColor;
   [TreatNullAs=EmptyString] attribute DOMString cellPadding;
@@ -2207,42 +2237,42 @@ partial interface HTMLTableElement {
 };
 
 partial interface HTMLTableSectionElement {
-           attribute DOMString align;
-           attribute DOMString ch;
-           attribute DOMString chOff;
-           attribute DOMString vAlign;
+  attribute DOMString align;
+  attribute DOMString ch;
+  attribute DOMString chOff;
+  attribute DOMString vAlign;
 };
 
 partial interface HTMLTableCellElement {
-           attribute DOMString align;
-           attribute DOMString axis;
-           attribute DOMString height;
-           attribute DOMString width;
+  attribute DOMString align;
+  attribute DOMString axis;
+  attribute DOMString height;
+  attribute DOMString width;
 
-           attribute DOMString ch;
-           attribute DOMString chOff;
-           attribute boolean noWrap;
-           attribute DOMString vAlign;
+  attribute DOMString ch;
+  attribute DOMString chOff;
+  attribute boolean noWrap;
+  attribute DOMString vAlign;
 
   [TreatNullAs=EmptyString] attribute DOMString bgColor;
 };
 
 partial interface HTMLTableDataCellElement {
-           attribute DOMString abbr;
+  attribute DOMString abbr;
 };
 
 partial interface HTMLTableRowElement {
-           attribute DOMString align;
-           attribute DOMString ch;
-           attribute DOMString chOff;
-           attribute DOMString vAlign;
+  attribute DOMString align;
+  attribute DOMString ch;
+  attribute DOMString chOff;
+  attribute DOMString vAlign;
 
   [TreatNullAs=EmptyString] attribute DOMString bgColor;
 };
 
 partial interface HTMLUListElement {
-           attribute boolean compact;
-           attribute DOMString type;
+  attribute boolean compact;
+  attribute DOMString type;
 };
 
 partial interface Document {