Merge remote-tracking branch 'upstream/master' into feat-cow-infra

`tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html`
was reverted to the upstream version.

1 files changed, 20 insertions, 12 deletions

diff --git a/components/script/dom/webidls/HTMLTrackElement.webidl b/components/script/dom/webidls/HTMLTrackElement.webidl
index 55733235321..350901cf2e9 100644
--- a/components/script/dom/webidls/HTMLTrackElement.webidl
+++ b/components/script/dom/webidls/HTMLTrackElement.webidl
@@ -1,20 +1,28 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#htmltrackelement
+[Exposed=Window]
 interface HTMLTrackElement : HTMLElement {
-  //         attribute DOMString kind;
-  //         attribute DOMString src;
-  //         attribute DOMString srclang;
-  //         attribute DOMString label;
-  //         attribute boolean default;
+  [HTMLConstructor] constructor();
 
-  //const unsigned short NONE = 0;
-  //const unsigned short LOADING = 1;
-  //const unsigned short LOADED = 2;
-  //const unsigned short ERROR = 3;
-  //readonly attribute unsigned short readyState;
+  [CEReactions]
+           attribute DOMString kind;
+  [CEReactions]
+           attribute USVString src;
+  [CEReactions]
+           attribute DOMString srclang;
+  [CEReactions]
+           attribute DOMString label;
+  [CEReactions]
+           attribute boolean default;
 
-  //readonly attribute TextTrack track;
+  const unsigned short NONE = 0;
+  const unsigned short LOADING = 1;
+  const unsigned short LOADED = 2;
+  const unsigned short ERROR = 3;
+  readonly attribute unsigned short readyState;
+
+  readonly attribute TextTrack track;
 };