Skip to content

🎥 Make videos programmatically with React

Fix Canvas Capture frame painting across canvases

JonnyBurgercb4db8a2e074
diff --git a/packages/canvas-capture-extension/src/capture.ts b/packages/canvas-capture-extension/src/capture.ts
index b608953a38..d23dcad639 100644
--- a/packages/canvas-capture-extension/src/capture.ts
+++ b/packages/canvas-capture-extension/src/capture.ts
@@ -5,7 +5,6 @@ import {
CanvasCaptureRecorder,
getScaledCanvasSize,
type HtmlInCanvasElement,
- type HtmlInCanvasOffscreenRenderingContext2D,
type HtmlInCanvasRenderingContext2D,
resetCanvas,
syncCanvasSize,
@@ -213,7 +212,7 @@ export class PageCapture {
readonly #recorder: CanvasCaptureRecorder;
readonly #context: HtmlInCanvasRenderingContext2D;
readonly #captureCanvas: OffscreenCanvas;
- readonly #captureContext: HtmlInCanvasOffscreenRenderingContext2D;
+ readonly #captureContext: OffscreenCanvasRenderingContext2D;
readonly #matteColors: readonly string[];
readonly #resizeObserver: ResizeObserver;
#restored = false;
@@ -240,11 +239,7 @@ export class PageCapture {
const context = this.#wrapped.canvas.getContext(
'2d',
) as HtmlInCanvasRenderingContext2D | null;
- if (
- !context ||
- typeof context.drawElementImage !== 'function' ||
- typeof this.#wrapped.canvas.captureElementImage !== 'function'
- ) {
+ if (!context || typeof context.drawElementImage !== 'function') {
this.#wrapped.restore();
throw new Error(
'The required HTML-in-canvas APIs are unavailable. Open chrome://flags/#canvas-draw-element, set Canvas Draw Element to Enabled, then fully quit and reopen the browser.',
@@ -253,17 +248,10 @@ export class PageCapture {
this.#context = context;
this.#captureCanvas = new OffscreenCanvas(2, 2);
- const captureContext = this.#captureCanvas.getContext(
- '2d',
- ) as HtmlInCanvasOffscreenRenderingContext2D | null;
- if (
- !captureContext ||
- typeof captureContext.drawElementImage !== 'function'
- ) {
+ const captureContext = this.#captureCanvas.getContext('2d');
+ if (!captureContext) {
this.#wrapped.restore();
- throw new Error(
- 'Could not create an HTML-in-canvas OffscreenCanvas 2D context.',
- );
+ throw new Error('Could not create an OffscreenCanvas 2D context.');
}
this.#captureContext = captureContext;
@@ -404,37 +392,30 @@ export class PageCapture {
this.#context.scale(displayScaleX, displayScaleY);
this.#context.drawElementImage!(this.#wrapped.content, 0, 0, width, height);
- const elementImage = this.#wrapped.canvas.captureElementImage!(
- this.#wrapped.content,
- );
- try {
- resetCanvas(this.#captureContext, this.#captureCanvas);
- for (const color of this.#matteColors) {
- this.#captureContext.fillStyle = color;
- this.#captureContext.fillRect(
- 0,
- 0,
- this.#captureCanvas.width,
- this.#captureCanvas.height,
- );
- }
-
- this.#captureContext.drawElementImage!(
- elementImage,
- crop.left,
- crop.top,
- crop.width,
- crop.height,
+ resetCanvas(this.#captureContext, this.#captureCanvas);
+ for (const color of this.#matteColors) {
+ this.#captureContext.fillStyle = color;
+ this.#captureContext.fillRect(
0,
0,
this.#captureCanvas.width,
this.#captureCanvas.height,
);
-
- this.#recorder.addFrame(this.#captureCanvas);
- } finally {
- elementImage.close();
}
+
+ this.#captureContext.drawImage(
+ this.#wrapped.canvas,
+ crop.left * displayScaleX,
+ crop.top * displayScaleY,
+ crop.width * displayScaleX,
+ crop.height * displayScaleY,
+ 0,
+ 0,
+ this.#captureCanvas.width,
+ this.#captureCanvas.height,
+ );
+
+ this.#recorder.addFrame(this.#captureCanvas);
};
#onPaint = () => {
diff --git a/packages/canvas-capture-extension/src/recorder.ts b/packages/canvas-capture-extension/src/recorder.ts
index 058ad4c2f9..50ae363578 100644
--- a/packages/canvas-capture-extension/src/recorder.ts
+++ b/packages/canvas-capture-extension/src/recorder.ts
@@ -70,28 +70,9 @@ type RecordingState = {
isFinalizing: boolean;
};
-export type HtmlInCanvasElementImage = {
- readonly width: number;
- readonly height: number;
- close: () => void;
-};
-
-type DrawElementImageSource = Element | HtmlInCanvasElementImage;
-
type DrawElementImage = {
(
- element: DrawElementImageSource,
- dx: number,
- dy: number,
- dWidth?: number,
- dHeight?: number,
- ): DOMMatrix;
- (
- element: DrawElementImageSource,
- sx: number,
- sy: number,
- sWidth: number,
- sHeight: number,
+ element: Element,
dx: number,
dy: number,
dWidth?: number,
@@ -102,7 +83,6 @@ type DrawElementImage = {
export type HtmlInCanvasElement = HTMLCanvasElement & {
layoutSubtree?: boolean;
requestPaint?: () => void;
- captureElementImage?: (element: Element) => HtmlInCanvasElementImage;
};
export type HtmlInCanvasRenderingContext2D = CanvasRenderingContext2D & {
@@ -110,12 +90,6 @@ export type HtmlInCanvasRenderingContext2D = CanvasRenderingContext2D & {
reset?: () => void;
};
-export type HtmlInCanvasOffscreenRenderingContext2D =
- OffscreenCanvasRenderingContext2D & {
- drawElementImage?: DrawElementImage;
- reset?: () => void;
- };
-
type CanvasCaptureRecorderOptions = {
readonly format: CaptureFormat;
readonly getContentRect: () => DOMRect;
@@ -139,23 +113,18 @@ export const isHtmlInCanvasAvailable = () => {
const captureContext =
typeof OffscreenCanvas === 'undefined'
? null
- : (new OffscreenCanvas(2, 2).getContext(
- '2d',
- ) as HtmlInCanvasOffscreenRenderingContext2D | null);
+ : new OffscreenCanvas(2, 2).getContext('2d');
return (
typeof canvas.requestPaint === 'function' &&
- typeof canvas.captureElementImage === 'function' &&
typeof context?.drawElementImage === 'function' &&
- typeof captureContext?.drawElementImage === 'function' &&
+ captureContext !== null &&
typeof VideoFrame !== 'undefined'
);
};
export const resetCanvas = (
- context:
- | HtmlInCanvasRenderingContext2D
- | HtmlInCanvasOffscreenRenderingContext2D,
+ context: HtmlInCanvasRenderingContext2D | OffscreenCanvasRenderingContext2D,
canvas: HTMLCanvasElement | OffscreenCanvas,
) => {
if (typeof context.reset === 'function') {