Merge branch 'scala-js:main' into main

scala-js · Mar 20, 2024 · 243aec1 · 243aec1
2 parents a8f31d5 + 7106ca1
commit 243aec1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/api-reports/2_12.txt b/api-reports/2_12.txt
@@ -1112,6 +1112,7 @@ CanvasRenderingContext2D[JC] def fill(path: Path2D, fillRule: CanvasFillRule): U
 CanvasRenderingContext2D[JC] def fillRect(x: Double, y: Double, w: Double, h: Double): Unit
 CanvasRenderingContext2D[JC] var fillStyle: js.Any
 CanvasRenderingContext2D[JC] def fillText(text: String, x: Double, y: Double, maxWidth: Double?): Unit
+CanvasRenderingContext2D[JC] var filter: String
 CanvasRenderingContext2D[JC] var font: String
 CanvasRenderingContext2D[JC] def getImageData(sx: Double, sy: Double, sw: Double, sh: Double): ImageData
 CanvasRenderingContext2D[JC] def getLineDash(): js.Array[Double]

diff --git a/api-reports/2_13.txt b/api-reports/2_13.txt
@@ -1112,6 +1112,7 @@ CanvasRenderingContext2D[JC] def fill(path: Path2D, fillRule: CanvasFillRule): U
 CanvasRenderingContext2D[JC] def fillRect(x: Double, y: Double, w: Double, h: Double): Unit
 CanvasRenderingContext2D[JC] var fillStyle: js.Any
 CanvasRenderingContext2D[JC] def fillText(text: String, x: Double, y: Double, maxWidth: Double?): Unit
+CanvasRenderingContext2D[JC] var filter: String
 CanvasRenderingContext2D[JC] var font: String
 CanvasRenderingContext2D[JC] def getImageData(sx: Double, sy: Double, sw: Double, sh: Double): ImageData
 CanvasRenderingContext2D[JC] def getLineDash(): js.Array[Double]

diff --git a/dom/src/main/scala/org/scalajs/dom/CanvasRenderingContext2D.scala b/dom/src/main/scala/org/scalajs/dom/CanvasRenderingContext2D.scala
@@ -62,6 +62,9 @@ class CanvasRenderingContext2D extends js.Object {
   /** A CSS color, a CanvasGradient or CanvasPattern, to use as a fill. */
   var fillStyle: js.Any = js.native
 
+  /** A CSS filter, which will be applied on the entire canvas. */
+  var filter: String = js.native
+
   /** Specifies the blurring effect. Default 0 */
   var shadowBlur: Double = js.native