@gjsify/canvas2d 0.4.0 → 0.4.4

package/package.json

@@ -1,51 +1,55 @@
 {
-  "name": "@gjsify/canvas2d",
-  "version": "0.4.0",
-  "description": "Canvas 2D rendering context for GJS, backed by Cairo",
-  "type": "module",
-  "module": "lib/esm/index.js",
-  "types": "lib/types/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./lib/types/index.d.ts",
-      "default": "./lib/esm/index.js"
+    "name": "@gjsify/canvas2d",
+    "version": "0.4.4",
+    "description": "Canvas 2D rendering context for GJS, backed by Cairo",
+    "type": "module",
+    "module": "lib/esm/index.js",
+    "types": "lib/types/index.d.ts",
+    "exports": {
+        ".": {
+            "types": "./lib/types/index.d.ts",
+            "default": "./lib/esm/index.js"
+        }
+    },
+    "files": [
+        "lib"
+    ],
+    "scripts": {
+        "clear": "rm -rf lib tmp tsconfig.tsbuildinfo test.gjs.mjs || exit 0",
+        "check": "tsc --noEmit",
+        "build": "gjsify run build:gjsify && gjsify run build:types",
+        "build:gjsify": "gjsify build --library 'src/**/*.{ts,js}' --exclude 'src/**/*.spec.{mts,ts}' 'src/test.{mts,ts}'",
+        "build:types": "tsc",
+        "build:test": "gjsify run build:test:gjs",
+        "build:test:gjs": "gjsify build src/test.mts --app gjs --outfile test.gjs.mjs",
+        "test": "gjsify run build:gjsify && gjsify run build:test && gjsify run test:gjs",
+        "test:gjs": "gjsify run test.gjs.mjs"
+    },
+    "keywords": [
+        "gjs",
+        "canvas",
+        "canvas2d",
+        "cairo"
+    ],
+    "dependencies": {
+        "@girs/gdk-4.0": "4.0.0-4.0.0-rc.15",
+        "@girs/gdkpixbuf-2.0": "2.0.0-4.0.0-rc.15",
+        "@girs/gjs": "4.0.0-rc.15",
+        "@girs/glib-2.0": "2.88.0-4.0.0-rc.15",
+        "@girs/gobject-2.0": "2.88.0-4.0.0-rc.15",
+        "@girs/gtk-4.0": "4.23.0-4.0.0-rc.15",
+        "@girs/pango-1.0": "1.57.1-4.0.0-rc.15",
+        "@girs/pangocairo-1.0": "1.0.0-4.0.0-rc.15",
+        "@gjsify/canvas2d-core": "^0.4.4",
+        "@gjsify/dom-elements": "^0.4.4",
+        "@gjsify/dom-events": "^0.4.4",
+        "@gjsify/event-bridge": "^0.4.4",
+        "@gjsify/utils": "^0.4.4"
+    },
+    "devDependencies": {
+        "@gjsify/cli": "^0.4.4",
+        "@gjsify/unit": "^0.4.4",
+        "@types/node": "^25.6.2",
+        "typescript": "^6.0.3"
     }
-  },
-  "scripts": {
-    "clear": "rm -rf lib tmp tsconfig.tsbuildinfo test.gjs.mjs || exit 0",
-    "check": "tsc --noEmit",
-    "build": "yarn build:gjsify && yarn build:types",
-    "build:gjsify": "gjsify build --library 'src/**/*.{ts,js}' --exclude 'src/**/*.spec.{mts,ts}' 'src/test.{mts,ts}'",
-    "build:types": "tsc",
-    "build:test": "yarn build:test:gjs",
-    "build:test:gjs": "gjsify build src/test.mts --app gjs --outfile test.gjs.mjs",
-    "test": "yarn build:gjsify && yarn build:test && yarn test:gjs",
-    "test:gjs": "gjsify run test.gjs.mjs"
-  },
-  "keywords": [
-    "gjs",
-    "canvas",
-    "canvas2d",
-    "cairo"
-  ],
-  "dependencies": {
-    "@girs/gdk-4.0": "4.0.0-4.0.0-rc.15",
-    "@girs/gdkpixbuf-2.0": "2.0.0-4.0.0-rc.15",
-    "@girs/gjs": "4.0.0-rc.15",
-    "@girs/glib-2.0": "2.88.0-4.0.0-rc.15",
-    "@girs/gobject-2.0": "2.88.0-4.0.0-rc.15",
-    "@girs/gtk-4.0": "4.23.0-4.0.0-rc.15",
-    "@girs/pango-1.0": "1.57.1-4.0.0-rc.15",
-    "@girs/pangocairo-1.0": "1.0.0-4.0.0-rc.15",
-    "@gjsify/canvas2d-core": "^0.4.0",
-    "@gjsify/dom-elements": "^0.4.0",
-    "@gjsify/event-bridge": "^0.4.0",
-    "@gjsify/utils": "^0.4.0"
-  },
-  "devDependencies": {
-    "@gjsify/cli": "^0.4.0",
-    "@gjsify/unit": "^0.4.0",
-    "@types/node": "^25.6.2",
-    "typescript": "^6.0.3"
-  }
-}
+}

package/src/cairo-utils.ts

@@ -1,243 +0,0 @@
-// Cairo utility helpers for Canvas 2D context
-// Handles format conversions and path operations not directly available in Cairo.
-
-import type Cairo from 'cairo';
-
-/**
- * Convert quadratic Bezier control point to cubic Bezier control points.
- * Canvas 2D has quadraticCurveTo but Cairo only has cubic curveTo.
- *
- * Given current point (cx, cy), quadratic control point (cpx, cpy), and end (x, y):
- *   cp1 = current + 2/3 * (cp - current)
- *   cp2 = end + 2/3 * (cp - end)
- */
-export function quadraticToCubic(
-    cx: number, cy: number,
-    cpx: number, cpy: number,
-    x: number, y: number,
-): { cp1x: number; cp1y: number; cp2x: number; cp2y: number } {
-    return {
-        cp1x: cx + (2 / 3) * (cpx - cx),
-        cp1y: cy + (2 / 3) * (cpy - cy),
-        cp2x: x + (2 / 3) * (cpx - x),
-        cp2y: y + (2 / 3) * (cpy - y),
-    };
-}
-
-/**
- * Compute arcTo parameters.
- * Canvas arcTo(x1,y1,x2,y2,radius) draws a line from current point to the tangent point,
- * then an arc of the given radius tangent to both lines (current→p1 and p1→p2).
- *
- * Returns the two tangent points and arc center, or null if degenerate (collinear points).
- */
-export function computeArcTo(
-    x0: number, y0: number,
-    x1: number, y1: number,
-    x2: number, y2: number,
-    radius: number,
-): { tx0: number; ty0: number; tx1: number; ty1: number; cx: number; cy: number; startAngle: number; endAngle: number; counterclockwise: boolean } | null {
-    // Direction vectors
-    const dx0 = x0 - x1;
-    const dy0 = y0 - y1;
-    const dx1 = x2 - x1;
-    const dy1 = y2 - y1;
-
-    // Lengths
-    const len0 = Math.sqrt(dx0 * dx0 + dy0 * dy0);
-    const len1 = Math.sqrt(dx1 * dx1 + dy1 * dy1);
-
-    if (len0 === 0 || len1 === 0) return null;
-
-    // Normalize
-    const ux0 = dx0 / len0;
-    const uy0 = dy0 / len0;
-    const ux1 = dx1 / len1;
-    const uy1 = dy1 / len1;
-
-    // Cross product to determine direction
-    const cross = ux0 * uy1 - uy0 * ux1;
-    if (Math.abs(cross) < 1e-10) return null; // Collinear
-
-    // Half-angle between the two direction vectors
-    const dot = ux0 * ux1 + uy0 * uy1;
-    const halfAngle = Math.acos(Math.max(-1, Math.min(1, dot))) / 2;
-
-    // Distance from p1 to tangent point
-    const tanDist = radius / Math.tan(halfAngle);
-
-    // Tangent points
-    const tx0 = x1 + ux0 * tanDist;
-    const ty0 = y1 + uy0 * tanDist;
-    const tx1 = x1 + ux1 * tanDist;
-    const ty1 = y1 + uy1 * tanDist;
-
-    // Center of the arc circle: perpendicular to the bisector, distance = radius / sin(halfAngle)
-    const centerDist = radius / Math.sin(halfAngle);
-    const bisectX = (ux0 + ux1) / 2;
-    const bisectY = (uy0 + uy1) / 2;
-    const bisectLen = Math.sqrt(bisectX * bisectX + bisectY * bisectY);
-    const cx = x1 + (bisectX / bisectLen) * centerDist;
-    const cy = y1 + (bisectY / bisectLen) * centerDist;
-
-    // Start and end angles
-    const startAngle = Math.atan2(ty0 - cy, tx0 - cx);
-    const endAngle = Math.atan2(ty1 - cy, tx1 - cx);
-
-    // Counterclockwise if cross product is positive
-    const counterclockwise = cross > 0;
-
-    return { tx0, ty0, tx1, ty1, cx, cy, startAngle, endAngle, counterclockwise };
-}
-
-/**
- * Apply an arcTo operation to a Cairo context.
- */
-export function cairoArcTo(
-    ctx: Cairo.Context,
-    x0: number, y0: number,
-    x1: number, y1: number,
-    x2: number, y2: number,
-    radius: number,
-): void {
-    const result = computeArcTo(x0, y0, x1, y1, x2, y2, radius);
-    if (!result) {
-        // Degenerate: just draw a line to (x1, y1)
-        ctx.lineTo(x1, y1);
-        return;
-    }
-
-    const { tx0, ty0, cx, cy, startAngle, endAngle, counterclockwise } = result;
-
-    // Line from current point to first tangent point
-    ctx.lineTo(tx0, ty0);
-
-    // Arc
-    if (counterclockwise) {
-        ctx.arcNegative(cx, cy, radius, startAngle, endAngle);
-    } else {
-        ctx.arc(cx, cy, radius, startAngle, endAngle);
-    }
-}
-
-/**
- * Draw an ellipse on a Cairo context.
- * Canvas ellipse(x, y, radiusX, radiusY, rotation, startAngle, endAngle, counterclockwise)
- * is implemented via save/translate/rotate/scale/arc/restore.
- */
-export function cairoEllipse(
-    ctx: Cairo.Context,
-    x: number, y: number,
-    radiusX: number, radiusY: number,
-    rotation: number,
-    startAngle: number, endAngle: number,
-    counterclockwise: boolean,
-): void {
-    ctx.save();
-    ctx.translate(x, y);
-    ctx.rotate(rotation);
-    ctx.scale(radiusX, radiusY);
-
-    if (counterclockwise) {
-        ctx.arcNegative(0, 0, 1, startAngle, endAngle);
-    } else {
-        ctx.arc(0, 0, 1, startAngle, endAngle);
-    }
-
-    ctx.restore();
-}
-
-/**
- * Draw a rounded rectangle path on a Cairo context.
- * Implements the Canvas roundRect(x, y, w, h, radii) method.
- */
-export function cairoRoundRect(
-    ctx: Cairo.Context,
-    x: number, y: number,
-    w: number, h: number,
-    radii: number | number[],
-): void {
-    // Normalize radii to [topLeft, topRight, bottomRight, bottomLeft]
-    let tl: number, tr: number, br: number, bl: number;
-    if (typeof radii === 'number') {
-        tl = tr = br = bl = radii;
-    } else if (radii.length === 1) {
-        tl = tr = br = bl = radii[0];
-    } else if (radii.length === 2) {
-        tl = br = radii[0];
-        tr = bl = radii[1];
-    } else if (radii.length === 3) {
-        tl = radii[0];
-        tr = bl = radii[1];
-        br = radii[2];
-    } else {
-        tl = radii[0];
-        tr = radii[1];
-        br = radii[2];
-        bl = radii[3];
-    }
-
-    // Clamp radii so they don't exceed half the width/height
-    const maxR = Math.min(w / 2, h / 2);
-    tl = Math.min(tl, maxR);
-    tr = Math.min(tr, maxR);
-    br = Math.min(br, maxR);
-    bl = Math.min(bl, maxR);
-
-    const PI_2 = Math.PI / 2;
-
-    ctx.newSubPath();
-    // Top-left corner
-    ctx.arc(x + tl, y + tl, tl, Math.PI, Math.PI + PI_2);
-    // Top-right corner
-    ctx.arc(x + w - tr, y + tr, tr, -PI_2, 0);
-    // Bottom-right corner
-    ctx.arc(x + w - br, y + h - br, br, 0, PI_2);
-    // Bottom-left corner
-    ctx.arc(x + bl, y + h - bl, bl, PI_2, Math.PI);
-    ctx.closePath();
-}
-
-/** Map Canvas globalCompositeOperation to Cairo.Operator values */
-export const COMPOSITE_OP_MAP: Record<string, number> = {
-    'source-over': 2,      // OVER
-    'source-in': 5,        // IN
-    'source-out': 6,       // OUT
-    'source-atop': 7,      // ATOP
-    'destination-over': 8, // DEST_OVER
-    'destination-in': 9,   // DEST_IN
-    'destination-out': 10, // DEST_OUT
-    'destination-atop': 11,// DEST_ATOP
-    'lighter': 12,         // ADD
-    'copy': 1,             // SOURCE
-    'xor': 13,             // XOR
-    'multiply': 14,        // MULTIPLY
-    'screen': 15,          // SCREEN
-    'overlay': 16,         // OVERLAY
-    'darken': 17,          // DARKEN
-    'lighten': 18,         // LIGHTEN
-    'color-dodge': 19,     // COLOR_DODGE
-    'color-burn': 20,      // COLOR_BURN
-    'hard-light': 21,      // HARD_LIGHT
-    'soft-light': 22,      // SOFT_LIGHT
-    'difference': 23,      // DIFFERENCE
-    'exclusion': 24,       // EXCLUSION
-    'hue': 25,             // HSL_HUE
-    'saturation': 26,      // HSL_SATURATION
-    'color': 27,           // HSL_COLOR
-    'luminosity': 28,      // HSL_LUMINOSITY
-};
-
-/** Map Canvas lineCap to Cairo.LineCap values */
-export const LINE_CAP_MAP: Record<string, number> = {
-    'butt': 0,
-    'round': 1,
-    'square': 2,
-};
-
-/** Map Canvas lineJoin to Cairo.LineJoin values */
-export const LINE_JOIN_MAP: Record<string, number> = {
-    'miter': 0,
-    'round': 1,
-    'bevel': 2,
-};

package/src/canvas-gradient.ts

@@ -1,2 +0,0 @@
-// Moved to @gjsify/canvas2d-core — re-exported here for backward compatibility.
-export { CanvasGradient } from '@gjsify/canvas2d-core';

package/src/canvas-path.ts

@@ -1,2 +0,0 @@
-// Moved to @gjsify/canvas2d-core — re-exported here for backward compatibility.
-export { Path2D } from '@gjsify/canvas2d-core';

package/src/canvas-pattern.ts

@@ -1,2 +0,0 @@
-// Moved to @gjsify/canvas2d-core — re-exported here for backward compatibility.
-export { CanvasPattern } from '@gjsify/canvas2d-core';

package/src/canvas-rendering-context-2d.ts

@@ -1,2 +0,0 @@
-// Moved to @gjsify/canvas2d-core — re-exported here for backward compatibility.
-export { CanvasRenderingContext2D } from '@gjsify/canvas2d-core';

package/src/canvas-state.ts

@@ -1,77 +0,0 @@
-// Drawing state for Canvas 2D context save()/restore() stack.
-// Each save() pushes a clone of the current state; restore() pops it.
-
-import type { RGBA } from './color.js';
-import { BLACK } from './color.js';
-
-export interface CanvasState {
-    // Fill & stroke
-    fillStyle: string | CanvasGradient | CanvasPattern;
-    fillColor: RGBA;
-    strokeStyle: string | CanvasGradient | CanvasPattern;
-    strokeColor: RGBA;
-
-    // Line properties
-    lineWidth: number;
-    lineCap: CanvasLineCap;
-    lineJoin: CanvasLineJoin;
-    miterLimit: number;
-    lineDash: number[];
-    lineDashOffset: number;
-
-    // Compositing
-    globalAlpha: number;
-    globalCompositeOperation: GlobalCompositeOperation;
-
-    // Shadows (Phase 5 — tracked in state for save/restore correctness)
-    shadowColor: string;
-    shadowBlur: number;
-    shadowOffsetX: number;
-    shadowOffsetY: number;
-
-    // Text (Phase 4)
-    font: string;
-    textAlign: CanvasTextAlign;
-    textBaseline: CanvasTextBaseline;
-    direction: CanvasDirection;
-
-    // Image smoothing
-    imageSmoothingEnabled: boolean;
-    imageSmoothingQuality: ImageSmoothingQuality;
-}
-
-export function createDefaultState(): CanvasState {
-    return {
-        fillStyle: '#000000',
-        fillColor: { ...BLACK },
-        strokeStyle: '#000000',
-        strokeColor: { ...BLACK },
-        lineWidth: 1,
-        lineCap: 'butt',
-        lineJoin: 'miter',
-        miterLimit: 10,
-        lineDash: [],
-        lineDashOffset: 0,
-        globalAlpha: 1,
-        globalCompositeOperation: 'source-over',
-        shadowColor: 'rgba(0, 0, 0, 0)',
-        shadowBlur: 0,
-        shadowOffsetX: 0,
-        shadowOffsetY: 0,
-        font: '10px sans-serif',
-        textAlign: 'start',
-        textBaseline: 'alphabetic',
-        direction: 'ltr',
-        imageSmoothingEnabled: true,
-        imageSmoothingQuality: 'low',
-    };
-}
-
-export function cloneState(state: CanvasState): CanvasState {
-    return {
-        ...state,
-        fillColor: { ...state.fillColor },
-        strokeColor: { ...state.strokeColor },
-        lineDash: [...state.lineDash],
-    };
-}

package/src/canvas2d-bridge.ts

@@ -1,196 +0,0 @@
-// Canvas2DBridge — GTK container for HTMLCanvasElement (2D) backed by Cairo.
-// Provides a Gtk.DrawingArea subclass that handles Canvas 2D bootstrapping.
-// Pattern follows packages/dom/iframe/src/iframe-bridge.ts (IFrameBridge)
-
-import GObject from 'gi://GObject';
-import Gdk from 'gi://Gdk?version=4.0';
-import GLib from 'gi://GLib?version=2.0';
-import Gtk from 'gi://Gtk?version=4.0';
-import { HTMLCanvasElement as GjsifyHTMLCanvasElement } from '@gjsify/dom-elements';
-import { attachEventControllers } from '@gjsify/event-bridge';
-import { CanvasRenderingContext2D } from '@gjsify/canvas2d-core';
-import { Event } from '@gjsify/dom-events';
-
-type Canvas2DReadyCallback = (canvas: globalThis.HTMLCanvasElement, ctx: CanvasRenderingContext2D) => void;
-
-/**
- * A `Gtk.DrawingArea` subclass that handles Canvas 2D bootstrapping:
- * - Creates an `HTMLCanvasElement` + `CanvasRenderingContext2D` on first draw
- * - Blits the Canvas 2D Cairo.ImageSurface onto the DrawingArea each frame
- * - Fires `onReady()` callbacks with (canvas, ctx) once the context is available
- * - Provides `requestAnimationFrame()` backed by GTK frame clock (vsync)
- * - `installGlobals()` sets `globalThis.requestAnimationFrame` and `globalThis.performance`
- *
- * Usage:
- * ```ts
- * const widget = new Canvas2DBridge();
- * widget.installGlobals();  // sets globalThis.requestAnimationFrame
- * widget.onReady((canvas, ctx) => {
- *     ctx.fillStyle = 'red';
- *     ctx.fillRect(0, 0, 100, 100);
- * });
- * window.set_child(widget);
- * ```
- */
-// Gtk.DrawingArea inherits a 'resize' signal with signature
-// (widget: Drawable, width: int, height: int) from its ancestors (Gtk.Widget).
-// WebGLBridge uses Gtk.GLArea which has the same-shaped signal. We do
-// NOT register a custom signal — we piggyback on the inherited one so
-// consumers can use a single pattern on both widgets:
-//   widget.connect('resize', (w, width, height) => { ... })
-// In addition, _onDraw fires onResize(cb) callbacks and dispatches a DOM
-// 'resize' event on the canvas for browser-style listeners.
-
-export const Canvas2DBridge = GObject.registerClass(
-    { GTypeName: 'GjsifyCanvas2DBridge' },
-    class Canvas2DBridge extends Gtk.DrawingArea {
-        _canvas: GjsifyHTMLCanvasElement | null = null;
-        _ctx: CanvasRenderingContext2D | null = null;
-        _readyCallbacks: Canvas2DReadyCallback[] = [];
-        _resizeCallbacks: ((w: number, h: number) => void)[] = [];
-        _tickCallbackId: number | null = null;
-        _frameCallback: FrameRequestCallback | null = null;
-        // Time origin in microseconds (GLib monotonic clock).
-        // Both requestAnimationFrame timestamps and performance.now() are
-        // relative to this origin, matching the browser DOMHighResTimeStamp spec.
-        _timeOrigin: number = GLib.get_monotonic_time();
-
-        constructor(params?: Partial<Gtk.DrawingArea.ConstructorProps>) {
-            super(params);
-            this.set_draw_func(this._onDraw.bind(this));
-
-            // Bridge GTK events → DOM events on the canvas element
-            // captureKeys: true prevents GTK focus traversal consuming arrow/Enter keys
-            attachEventControllers(this, () => this._canvas, { captureKeys: true });
-
-            this.connect('unrealize', () => {
-                if (this._tickCallbackId !== null) {
-                    this.remove_tick_callback(this._tickCallbackId);
-                    this._tickCallbackId = null;
-                }
-                if (this._ctx) {
-                    this._ctx._dispose();
-                }
-                this._canvas = null;
-                this._ctx = null;
-            });
-        }
-
-        /** @internal Draw function called by GTK. Blits the Cairo surface to screen. */
-        _onDraw(_area: Gtk.DrawingArea, cr: any, width: number, height: number): void {
-            // Lazy init: create canvas + 2D context on first draw.
-            // We do NOT sync dimensions after onReady fires: ready callbacks may set their
-            // own canvas dimensions (e.g. a static render at a fixed size). Syncing here
-            // would clear the surface they just drew into.
-            if (!this._canvas) {
-                this._canvas = new GjsifyHTMLCanvasElement();
-                this._canvas.width = width;
-                this._canvas.height = height;
-                // Import side-effect registers the '2d' factory, so getContext('2d') works
-                this._ctx = this._canvas.getContext('2d') as unknown as CanvasRenderingContext2D;
-                if (this._ctx) {
-                    for (const cb of this._readyCallbacks) {
-                        cb(this._canvas as unknown as globalThis.HTMLCanvasElement, this._ctx);
-                    }
-                    this._readyCallbacks = [];
-                }
-            } else if (this._canvas.width !== width || this._canvas.height !== height) {
-                // Subsequent draw: GTK widget was resized — sync canvas and notify listeners.
-                // NOTE: Gtk.DrawingArea itself emits the 'resize' GObject signal
-                // (inherited) when the allocation changes, so consumers can use
-                // widget.connect('resize', ...) without us emitting it here.
-                // We additionally dispatch a DOM 'resize' event on the canvas
-                // and fire onResize() callbacks for cross-widget API parity
-                // with WebGLBridge.
-                this._canvas.width = width;
-                this._canvas.height = height;
-                this._canvas.dispatchEvent(new Event('resize'));
-                for (const cb of this._resizeCallbacks) {
-                    cb(width, height);
-                }
-            }
-
-            // Blit the Canvas 2D's Cairo.ImageSurface onto the DrawingArea
-            if (this._ctx) {
-                const surface = this._ctx._getSurface();
-                cr.setSourceSurface(surface, 0, 0);
-                cr.paint();
-            }
-        }
-
-        /** The HTMLCanvasElement backing this widget. Available after the first draw. */
-        get canvas(): globalThis.HTMLCanvasElement | null {
-            return this._canvas as unknown as globalThis.HTMLCanvasElement | null;
-        }
-
-        /** Get the 2D rendering context. Available after the first draw. */
-        getContext(_id: '2d'): CanvasRenderingContext2D | null {
-            return this._ctx;
-        }
-
-        /**
-         * Register a callback to be invoked once the Canvas 2D context is ready.
-         * If the context is already available, the callback fires synchronously.
-         */
-        onReady(cb: Canvas2DReadyCallback): void {
-            if (this._canvas && this._ctx) {
-                cb(this._canvas as unknown as globalThis.HTMLCanvasElement, this._ctx);
-                return;
-            }
-            this._readyCallbacks.push(cb);
-        }
-
-        /**
-         * Register a callback invoked whenever the GTK widget is resized.
-         * Canvas dimensions are already updated when the callback fires.
-         * Call `queue_draw()` after re-rendering to push the new surface to screen.
-         */
-        onResize(cb: (width: number, height: number) => void): void {
-            this._resizeCallbacks.push(cb);
-        }
-
-        /**
-         * Schedules a single animation frame callback, matching the browser `requestAnimationFrame` API.
-         * Backed by GTK frame clock (vsync-synced, typically ~60 FPS).
-         * Returns 0 (handle — cancel not yet implemented).
-         */
-        requestAnimationFrame(cb: FrameRequestCallback): number {
-            this._frameCallback = cb;
-            if (this._tickCallbackId === null) {
-                this._tickCallbackId = this.add_tick_callback((_widget: Gtk.Widget, frameClock: Gdk.FrameClock) => {
-                    this._tickCallbackId = null;
-                    // DOMHighResTimeStamp: ms since time origin, matching performance.now()
-                    const time = (frameClock.get_frame_time() - this._timeOrigin) / 1000;
-                    this._frameCallback?.(time);
-                    this.queue_draw();
-                    return GLib.SOURCE_REMOVE;
-                });
-            }
-            // Ensure GTK schedules a new frame so the tick callback fires.
-            // Without this, requestAnimationFrame called during the paint phase
-            // (e.g. from onReady) may not trigger the frame clock to tick again.
-            this.queue_draw();
-            return 0;
-        }
-
-        /**
-         * Sets browser globals (`requestAnimationFrame`, `performance`) so that
-         * browser-targeted code works unchanged on GJS.
-         */
-        installGlobals(): void {
-            (globalThis as any).requestAnimationFrame = (cb: FrameRequestCallback) =>
-                this.requestAnimationFrame(cb);
-            // Install performance.now() on the same time origin as rAF timestamps.
-            // Always override to ensure consistency — native GJS performance.now()
-            // may use a different time origin than the frame clock.
-            const timeOrigin = this._timeOrigin;
-            (globalThis as any).performance = {
-                now: () => (GLib.get_monotonic_time() - timeOrigin) / 1000,
-                timeOrigin: Date.now(),
-            };
-        }
-    }
-);
-
-// Export the instance type so callers can type-annotate their Canvas2DBridge variables
-export type Canvas2DBridge = InstanceType<typeof Canvas2DBridge>;