Skip to content

Commit 243aec1

Browse files
authored
Merge branch 'scala-js:main' into main
2 parents a8f31d5 + 7106ca1 commit 243aec1

File tree

3 files changed

+5
-0
lines changed

3 files changed

+5
-0
lines changed

Diff for: api-reports/2_12.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1112,6 +1112,7 @@ CanvasRenderingContext2D[JC] def fill(path: Path2D, fillRule: CanvasFillRule): U
11121112
CanvasRenderingContext2D[JC] def fillRect(x: Double, y: Double, w: Double, h: Double): Unit
11131113
CanvasRenderingContext2D[JC] var fillStyle: js.Any
11141114
CanvasRenderingContext2D[JC] def fillText(text: String, x: Double, y: Double, maxWidth: Double?): Unit
1115+
CanvasRenderingContext2D[JC] var filter: String
11151116
CanvasRenderingContext2D[JC] var font: String
11161117
CanvasRenderingContext2D[JC] def getImageData(sx: Double, sy: Double, sw: Double, sh: Double): ImageData
11171118
CanvasRenderingContext2D[JC] def getLineDash(): js.Array[Double]

Diff for: api-reports/2_13.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1112,6 +1112,7 @@ CanvasRenderingContext2D[JC] def fill(path: Path2D, fillRule: CanvasFillRule): U
11121112
CanvasRenderingContext2D[JC] def fillRect(x: Double, y: Double, w: Double, h: Double): Unit
11131113
CanvasRenderingContext2D[JC] var fillStyle: js.Any
11141114
CanvasRenderingContext2D[JC] def fillText(text: String, x: Double, y: Double, maxWidth: Double?): Unit
1115+
CanvasRenderingContext2D[JC] var filter: String
11151116
CanvasRenderingContext2D[JC] var font: String
11161117
CanvasRenderingContext2D[JC] def getImageData(sx: Double, sy: Double, sw: Double, sh: Double): ImageData
11171118
CanvasRenderingContext2D[JC] def getLineDash(): js.Array[Double]

Diff for: dom/src/main/scala/org/scalajs/dom/CanvasRenderingContext2D.scala

+3
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ class CanvasRenderingContext2D extends js.Object {
6262
/** A CSS color, a CanvasGradient or CanvasPattern, to use as a fill. */
6363
var fillStyle: js.Any = js.native
6464

65+
/** A CSS filter, which will be applied on the entire canvas. */
66+
var filter: String = js.native
67+
6568
/** Specifies the blurring effect. Default 0 */
6669
var shadowBlur: Double = js.native
6770

0 commit comments

Comments
 (0)