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/HTMLCanvasElement.webidl b/components/script/dom/webidls/HTMLCanvasElement.webidl
index fbb53016605..5c33aa3532e 100644
--- a/components/script/dom/webidls/HTMLCanvasElement.webidl
+++ b/components/script/dom/webidls/HTMLCanvasElement.webidl
@@ -1,23 +1,31 @@
 /* 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/#htmlcanvaselement
-typedef (CanvasRenderingContext2D or WebGLRenderingContext) RenderingContext;
+typedef (CanvasRenderingContext2D
+  or WebGLRenderingContext
+  or WebGL2RenderingContext
+  or GPUCanvasContext) RenderingContext;
 
+[Exposed=Window]
 interface HTMLCanvasElement : HTMLElement {
-  [Pure]
-           attribute unsigned long width;
-  [Pure]
-           attribute unsigned long height;
+  [HTMLConstructor] constructor();
 
-  RenderingContext? getContext(DOMString contextId, any... arguments);
-  //boolean probablySupportsContext(DOMString contextId, any... arguments);
+  [CEReactions, Pure] attribute unsigned long width;
+  [CEReactions, Pure] attribute unsigned long height;
 
-  //void setContext(RenderingContext context);
-  //CanvasProxy transferControlToProxy();
+  RenderingContext? getContext(DOMString contextId, optional any options = null);
 
   [Throws]
-  DOMString toDataURL(optional DOMString type, any... arguments);
-  //void toBlob(FileCallback? _callback, optional DOMString type, any... arguments);
+  USVString toDataURL(optional DOMString type, optional any quality);
+  //void toBlob(BlobCallback _callback, optional DOMString type, optional any quality);
+  //OffscreenCanvas transferControlToOffscreen();
 };
+
+partial interface HTMLCanvasElement {
+    [Pref="dom.canvas_capture.enabled"]
+    MediaStream captureStream (optional double frameRequestRate);
+};
+
+//callback BlobCallback = void (Blob? blob);