@shopify/react-native-skia 2.12.0-next.1 → 2.13.0

package/src/views/SkiaPictureView.web.tsx

@@ -36,32 +36,191 @@ interface Renderer {
   dispose(): void;
 }
 
+// A <canvas> element owns at most one WebGL context for its whole lifetime.
+// A renderer, on the other hand, lives as long as the layout effect that
+// creates it, which is shorter: React re-runs layout effects on a *preserved*
+// host node under StrictMode's DEV double-invoke and when an Activity/offscreen
+// subtree is hidden and revealed (#3976). What belongs to the element rather
+// than to a renderer is tracked here, per element:
+// - the context, so that a new renderer can tell whether the element already
+//   has one (and whether it is lost) without calling getContext() itself,
+//   which on a fresh element would create a context with the wrong attributes
+//   (CanvasKit.GetWebGLContext requests its own);
+// - the WEBGL_lose_context extension, captured while the context is healthy:
+//   getExtension() returns null on a lost context, and this object is the only
+//   way to lose a context on purpose or to ask the browser to restore one;
+// - whether the browser has announced the loss of the context yet: a lost
+//   context can only be restored once its webglcontextlost event has been
+//   dispatched, and that event is asynchronous;
+// - the renderer currently attached to the element, if any.
+interface CanvasWebGL {
+  gl: WebGLRenderingContext | WebGL2RenderingContext;
+  // The WEBGL_lose_context extension.
+  loseContext: { loseContext(): void; restoreContext(): void } | null;
+  lossAnnounced: boolean;
+  owner: WebGLRenderer | null;
+}
+const canvasWebGL = new WeakMap<HTMLCanvasElement, CanvasWebGL>();
+
+// Unregisters a context from CanvasKit's registry, which otherwise retains the
+// canvas element (and its detached DOM tree) forever (#3924).
+const deleteContextHandle = (handle: WebGLContextHandle) => {
+  CanvasKit.deleteContext(handle);
+  // Making the now-deleted handle current clears CanvasKit's current-context
+  // globals (GLctx/Module.ctx), which would otherwise keep referencing the
+  // context (and the canvas) until another surface becomes current. With a
+  // deleted handle this is a no-op that returns null without creating
+  // anything.
+  CanvasKit.MakeWebGLContext(handle);
+};
+
 class WebGLRenderer implements Renderer {
   private surface: JsiSkSurface | null = null;
   private grContext: GrDirectContext | null = null;
   private contextHandle: WebGLContextHandle = 0;
   private pd = 1;
+  // Set while the renderer is waiting for a lost context to be restored.
+  private restoreWanted = false;
+  private restoreRequest: ReturnType<typeof setTimeout> | null = null;
+
+  constructor(
+    private canvas: HTMLCanvasElement,
+    // Called when the renderer becomes able to paint again and the current
+    // picture should be drawn.
+    private requestRedraw: () => void
+  ) {
+    const entry = canvasWebGL.get(canvas);
+    if (entry) {
+      entry.owner = this;
+    }
+    canvas.addEventListener("webglcontextlost", this.onContextLost);
+    canvas.addEventListener("webglcontextrestored", this.onContextRestored);
+    this.acquire();
+  }
 
-  constructor(private canvas: HTMLCanvasElement) {
-    this.contextHandle = CanvasKit.GetWebGLContext(canvas);
-    if (!this.contextHandle) {
+  // Builds the GrDirectContext and the surface on the element's WebGL
+  // context, creating the context first if the element has none.
+  private acquire() {
+    const { canvas } = this;
+    const known = canvasWebGL.get(canvas);
+    if (known?.gl.isContextLost()) {
+      // Nothing can be built on a lost context: CanvasKit.GetWebGLContext
+      // happily registers it, and MakeWebGLContext then faults inside wasm
+      // (#3976). Ask the browser for it back and finish in onContextRestored;
+      // if the loss hasn't been announced yet, onContextLost asks.
+      this.restoreWanted = true;
+      if (known.lossAnnounced) {
+        known.loseContext?.restoreContext();
+      }
+      return;
+    }
+    const handle = CanvasKit.GetWebGLContext(canvas);
+    if (!handle) {
       throw new Error("Could not create a WebGL context");
     }
-    this.grContext = CanvasKit.MakeWebGLContext(this.contextHandle);
-    if (!this.grContext) {
-      CanvasKit.deleteContext(this.contextHandle);
-      this.contextHandle = 0;
+    const entry = known ?? this.trackContext();
+    let grContext: GrDirectContext | null = null;
+    try {
+      grContext = CanvasKit.MakeWebGLContext(handle);
+    } finally {
+      if (!grContext) {
+        // Whether it returned null or threw, don't leave the registry
+        // holding on to the canvas.
+        deleteContextHandle(handle);
+      }
+    }
+    if (!grContext) {
       throw new Error("Could not create a graphics context");
     }
-    const ctx = canvas.getContext("webgl2");
-    if (ctx) {
-      ctx.drawingBufferColorSpace = "display-p3";
+    this.restoreWanted = false;
+    this.contextHandle = handle;
+    this.grContext = grContext;
+    if (entry) {
+      entry.gl.drawingBufferColorSpace = "display-p3";
     }
     this.onResize();
   }
 
+  // CanvasKit just created the element's context; asking for it again hands
+  // back the same object (the attributes are only honored the first time).
+  private trackContext(): CanvasWebGL | null {
+    const { canvas } = this;
+    const gl = canvas.getContext("webgl2") ?? canvas.getContext("webgl");
+    if (!gl) {
+      return null;
+    }
+    const entry: CanvasWebGL = {
+      gl,
+      loseContext: gl.getExtension("WEBGL_lose_context"),
+      lossAnnounced: false,
+      owner: this,
+    };
+    canvasWebGL.set(canvas, entry);
+    // Browsers restore a lost context (evicted as the oldest one when the
+    // page exceeds the active-context limit, or lost to a GPU reset) only if
+    // the page called preventDefault() on the webglcontextlost event. A
+    // renderer isn't necessarily attached when that happens (the canvas may
+    // be in a hidden Activity), so these listeners live as long as the
+    // element does. They are registered ahead of any renderer's, and the
+    // loss can't be announced before they exist since the event is
+    // asynchronous.
+    canvas.addEventListener("webglcontextlost", (event) => {
+      event.preventDefault();
+      entry.lossAnnounced = true;
+    });
+    canvas.addEventListener("webglcontextrestored", () => {
+      entry.lossAnnounced = false;
+    });
+    return entry;
+  }
+
+  // Frees everything built on the context. The context itself belongs to the
+  // element, see dispose().
+  private release() {
+    this.surface?.ref.delete();
+    this.surface = null;
+    if (this.grContext) {
+      this.grContext.releaseResourcesAndAbandonContext();
+      this.grContext.delete();
+      this.grContext = null;
+    }
+    if (this.contextHandle) {
+      deleteContextHandle(this.contextHandle);
+      this.contextHandle = 0;
+    }
+  }
+
+  private isContextLost() {
+    return canvasWebGL.get(this.canvas)?.gl.isContextLost() ?? false;
+  }
+
+  private onContextLost = () => {
+    // The browser already dropped every GL object; drop our references to
+    // them. Restoration is left to the browser (it restores an evicted
+    // context as soon as a slot frees up), except when this renderer was
+    // built on an already-lost context and is waiting to paint for the first
+    // time: chasing an eviction from here would evict the next-oldest context
+    // in turn, and with more live canvases than the browser allows the
+    // canvases would endlessly evict each other.
+    this.release();
+    if (this.restoreWanted) {
+      // The permission granted by preventDefault() is only recorded by the
+      // browser once the event dispatch is over: a restoreContext() call
+      // from inside the handler is refused, so ask from a later task.
+      this.restoreRequest = setTimeout(() => {
+        this.restoreRequest = null;
+        canvasWebGL.get(this.canvas)?.loseContext?.restoreContext();
+      }, 0);
+    }
+  };
+
+  private onContextRestored = () => {
+    this.acquire();
+    this.requestRedraw();
+  };
+
   makeImageSnapshot(picture: SkPicture, rect?: SkRect): SkImage | null {
-    if (!this.surface) {
+    if (!this.surface || this.isContextLost()) {
       return null;
     }
     const canvas = this.surface.getCanvas();
@@ -73,7 +232,10 @@ class WebGLRenderer implements Renderer {
 
   onResize() {
     const { canvas } = this;
-    if (!this.grContext) {
+    if (!this.grContext || this.isContextLost()) {
+      // Waiting for the context to be restored (the restore path resizes),
+      // or the loss hasn't been announced yet and onContextLost is about to
+      // release everything: either way there is nothing to build on.
       return;
     }
     this.pd = window.devicePixelRatio;
@@ -101,41 +263,57 @@ class WebGLRenderer implements Renderer {
   }
 
   draw(picture: SkPicture) {
-    if (this.surface) {
-      const canvas = this.surface.getCanvas();
-      canvas.clear(Float32Array.of(0, 0, 0, 0));
-      canvas.save();
-      canvas.scale(this.pd, this.pd);
-      canvas.drawPicture(picture);
-      canvas.restore();
-      this.surface.ref.flush();
+    if (!this.surface || this.isContextLost()) {
+      return;
     }
+    const canvas = this.surface.getCanvas();
+    canvas.clear(Float32Array.of(0, 0, 0, 0));
+    canvas.save();
+    canvas.scale(this.pd, this.pd);
+    canvas.drawPicture(picture);
+    canvas.restore();
+    this.surface.ref.flush();
   }
 
   dispose(): void {
-    this.surface?.ref.delete();
-    this.surface = null;
-    if (this.grContext) {
-      this.grContext.releaseResourcesAndAbandonContext();
-      this.grContext.delete();
-      this.grContext = null;
+    const { canvas } = this;
+    canvas.removeEventListener("webglcontextlost", this.onContextLost);
+    canvas.removeEventListener("webglcontextrestored", this.onContextRestored);
+    if (this.restoreRequest !== null) {
+      clearTimeout(this.restoreRequest);
+      this.restoreRequest = null;
     }
-    this.canvas
-      ?.getContext("webgl2")
-      ?.getExtension("WEBGL_lose_context")
-      ?.loseContext();
-    if (this.contextHandle) {
-      // Unregister the context from CanvasKit's internal registry, otherwise
-      // it retains the canvas element (and its detached DOM tree) forever.
-      CanvasKit.deleteContext(this.contextHandle);
-      // Making the now-deleted handle current clears CanvasKit's
-      // current-context globals (GLctx/Module.ctx), which would otherwise
-      // keep referencing the context (and the canvas) until another surface
-      // becomes current. With a deleted handle this is a no-op that returns
-      // null without creating anything.
-      CanvasKit.MakeWebGLContext(this.contextHandle);
-      this.contextHandle = 0;
+    this.restoreWanted = false;
+    this.release();
+    // Free the drawing buffer, which CanvasKit requests with depth and stencil
+    // attachments (about 8 bytes per pixel): a canvas that stays in the
+    // document without a renderer, hidden in an Activity say, would otherwise
+    // keep a full-size buffer around. The next renderer's onResize() sizes it
+    // again.
+    canvas.width = 0;
+    canvas.height = 0;
+    const entry = canvasWebGL.get(canvas);
+    if (!entry) {
+      return;
     }
+    entry.owner = null;
+    // Whether the element is going away is only known once the commit is
+    // over: on a real unmount React runs this cleanup *before* removing the
+    // node from the document, while StrictMode's double-invoke and an
+    // Activity hide keep the node in place (and the former builds the next
+    // renderer on it right away). Losing the context of a detached element
+    // matters: it would otherwise stay alive until the element is garbage
+    // collected, and browsers cap the number of live contexts per page
+    // (16 in Chrome, which then evicts the oldest one, visible or not).
+    queueMicrotask(() => {
+      if (
+        entry.owner === null &&
+        !canvas.isConnected &&
+        !entry.gl.isContextLost()
+      ) {
+        entry.loseContext?.loseContext();
+      }
+    });
   }
 }
 
@@ -370,22 +548,30 @@ export const SkiaPictureView = (props: SkiaPictureViewProps) => {
   // - The renderer is created synchronously on mount (the canvas element is
   //   guaranteed to exist in useLayoutEffect; a zero size at that point is
   //   fine, the surface is created once the canvas is measurable).
-  // - Redraw requests coalesce into a single animation frame. A picture
-  //   dispatched before the canvas has a size stays in pictureRef (drawing
-  //   while unmeasured is a no-op) and is painted by the resize path below
-  //   once the canvas becomes measurable, so it is never lost.
+  // - Redraw requests coalesce into a single microtask. A microtask (not an
+  //   animation frame) so that a picture produced inside a rAF callback (the
+  //   Reanimated mapper) is drawn before the current frame paints: deferring
+  //   to the next rAF alternates between "flush pending in this frame" and
+  //   "flush scheduled for the next frame", drawing on every other frame
+  //   only and halving the effective frame rate. A picture dispatched before
+  //   the canvas has a size stays in pictureRef (drawing while unmeasured is
+  //   a no-op) and is painted by the resize path below once the canvas
+  //   becomes measurable, so it is never lost.
   // - A ResizeObserver on the canvas itself recreates the surface and repaints
   //   synchronously (its callbacks run after layout, before paint), and is
   //   also the source of the user-facing onLayout event.
+  // - The renderer belongs to the layout effect, the WebGL context to the
+  //   <canvas> element, whose lifetime is longer; see WebGLRenderer for how
+  //   the two are reconciled.
   const redrawPendingRef = useRef(false);
-  const frameRef = useRef(0);
+  const flushScheduledRef = useRef(false);
   const onLayoutRef = useRef(onLayout);
   useLayoutEffect(() => {
     onLayoutRef.current = onLayout;
   }, [onLayout]);
 
   const flushRedraw = useCallback(() => {
-    frameRef.current = 0;
+    flushScheduledRef.current = false;
     if (redrawPendingRef.current && rendererRef.current && pictureRef.current) {
       redrawPendingRef.current = false;
       rendererRef.current.draw(pictureRef.current);
@@ -396,8 +582,9 @@ export const SkiaPictureView = (props: SkiaPictureViewProps) => {
 
   const redraw = useCallback(() => {
     redrawPendingRef.current = true;
-    if (frameRef.current === 0) {
-      frameRef.current = requestAnimationFrame(flushRedraw);
+    if (!flushScheduledRef.current) {
+      flushScheduledRef.current = true;
+      queueMicrotask(flushRedraw);
     }
   }, [flushRedraw]);
 
@@ -482,7 +669,7 @@ export const SkiaPictureView = (props: SkiaPictureViewProps) => {
     }
     const renderer = isStatic
       ? new StaticWebGLRenderer(canvas)
-      : new WebGLRenderer(canvas);
+      : new WebGLRenderer(canvas, redraw);
     rendererRef.current = renderer;
 
     const drawPicture = () => {
@@ -566,14 +753,11 @@ export const SkiaPictureView = (props: SkiaPictureViewProps) => {
       rendererRef.current = null;
       renderer.dispose();
     };
-  }, [isStatic]);
+  }, [isStatic, redraw]);
 
-  useEffect(() => {
-    return () => {
-      cancelAnimationFrame(frameRef.current);
-      frameRef.current = 0;
-    };
-  }, []);
+  // No flush cancellation is needed on unmount: a microtask queued before
+  // unmount runs within the same task, and flushRedraw no-ops once the
+  // layout-effect cleanup has nulled rendererRef.
 
   useImperativeHandle(
     ref,
@@ -632,6 +816,10 @@ export const SkiaPictureView = (props: SkiaPictureViewProps) => {
   return (
     <Platform.View {...viewProps}>
       <canvas
+        // A canvas element is bound to one context kind for life (WebGL for
+        // the live renderer, 2D for the static one), so switching renderers
+        // needs a fresh element.
+        key={isStatic ? "static" : "webgl"}
         ref={canvasRef}
         style={{ display: "block", width: "100%", height: "100%" }}
       />

package/src/views/types.ts

@@ -1,7 +1,5 @@
 import type { ViewProps } from "react-native";
-import type { SharedValue } from "react-native-reanimated";
 
-import type { Node } from "../dom/types";
 import type { SkImage, SkPicture, SkRect, SkSize } from "../skia/types";
 
 export type NativeSkiaViewProps = ViewProps & {
@@ -9,6 +7,22 @@ export type NativeSkiaViewProps = ViewProps & {
   opaque?: boolean;
 };
 
+export type AndroidSurfaceType = "SurfaceView" | "TextureView";
+
+export interface AndroidCanvasProps {
+  /**
+   * Backing view. Defaults to `SurfaceView` when the canvas is `opaque` and to
+   * `TextureView` otherwise; both composite correctly in React Native stacking
+   * order without further flags.
+   */
+  surfaceType?: AndroidSurfaceType;
+  /**
+   * SurfaceView only: composite above every React Native view in the window,
+   * ignoring `zIndex`. Ignored for TextureView. Defaults to false.
+   */
+  zOrderOnTop?: boolean;
+}
+
 export interface ISkiaViewApi {
   web?: boolean;
   setJsiProperty: <T>(nativeId: number, name: string, value: T) => void;
@@ -24,12 +38,12 @@ export interface SkiaBaseViewProps extends ViewProps {
    * average time it takes to render.
    */
   debug?: boolean;
+
   /**
-   * Pass an animated value to the onSize property to get updates when
-   * the Skia view is resized.
+   * Declares that the canvas covers every pixel of its bounds. On Android an
+   * opaque canvas is backed by a `SurfaceView` by default, the cheapest path
+   * (see `android.surfaceType`). Defaults to false.
    */
-  onSize?: SharedValue<SkSize>;
-
   opaque?: boolean;
 
   /**
@@ -39,6 +53,9 @@ export interface SkiaBaseViewProps extends ViewProps {
    */
   highBitDepth?: boolean;
 
+  /** Android-only rendering options. Ignored on iOS and web. */
+  android?: AndroidCanvasProps;
+
   // On web, only 16 WebGL contextes are allowed. If the drawing is non-animated, set
   // __destroyWebGLContextAfterRender to true to release the context after each draw.
   __destroyWebGLContextAfterRender?: boolean;
@@ -48,7 +65,3 @@ export interface SkiaPictureViewNativeProps extends SkiaBaseViewProps {
   picture?: SkPicture;
   androidWarmup?: boolean;
 }
-
-export interface SkiaDomViewNativeProps extends SkiaBaseViewProps {
-  root?: Node<unknown>;
-}

package/android/src/latest/java/com/shopify/reactnative/skia/ReactNativeCompatible.java

@@ -1,11 +0,0 @@
-package com.shopify.reactnative.skia;
-
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.RuntimeExecutor;
-
-/* package */ final class ReactNativeCompatible {
-    public static RuntimeExecutor getRuntimeExecutor(ReactContext context) {
-        return context.getCatalystInstance().getRuntimeExecutor();
-    }
-}
-

package/android/src/main/java/com/shopify/reactnative/skia/RNSkiaPackage.java

@@ -1,79 +0,0 @@
-// RnskiaPackage.java
-
-package com.shopify.reactnative.skia;
-
-import androidx.annotation.Nullable;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.facebook.react.TurboReactPackage;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.module.annotations.ReactModule;
-import com.facebook.react.module.annotations.ReactModuleList;
-import com.facebook.react.module.model.ReactModuleInfo;
-import com.facebook.react.module.model.ReactModuleInfoProvider;
-import com.facebook.react.turbomodule.core.interfaces.TurboModule;
-import com.facebook.react.uimanager.ViewManager;
-
-@ReactModuleList(
-        nativeModules = {
-                RNSkiaModule.class,
-        })
-public class RNSkiaPackage extends TurboReactPackage {
-    @Override
-    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-        return Arrays.<NativeModule>asList(new RNSkiaModule(reactContext));
-    }
-
-    @Nullable
-    @Override
-    public NativeModule getModule(String s, ReactApplicationContext reactApplicationContext) {
-        switch (s) {
-            case RNSkiaModule.NAME:
-                return new RNSkiaModule(reactApplicationContext);
-            default:
-                return null;
-        }
-    }
-
-    @Override
-    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-        return Arrays.<ViewManager>asList(
-            new SkiaPictureViewManager()
-        );
-    }
-
-    @Override
-    public ReactModuleInfoProvider getReactModuleInfoProvider() {
-        return new ReactModuleInfoProvider() {
-            @Override
-            public Map<String, ReactModuleInfo> getReactModuleInfos() {
-                final Map<String, ReactModuleInfo> reactModuleInfoMap = new HashMap<>();
-                Class<? extends NativeModule>[] moduleList =
-                        new Class[] {
-                                RNSkiaModule.class,
-                        };
-
-                for (Class<? extends NativeModule> moduleClass : moduleList) {
-                    ReactModule reactModule = moduleClass.getAnnotation(ReactModule.class);
-
-                    reactModuleInfoMap.put(
-                            reactModule.name(),
-                            new ReactModuleInfo(
-                                    reactModule.name(),
-                                    moduleClass.getName(),
-                                    reactModule.canOverrideExistingModule(),
-                                    reactModule.needsEagerInit(),
-                                    reactModule.hasConstants(),
-                                    reactModule.isCxxModule(),
-                                    TurboModule.class.isAssignableFrom(moduleClass)));
-                }
-                return reactModuleInfoMap;
-            }
-        };
-    }
-}

package/android/src/main/java/com/shopify/reactnative/skia/SkiaAHBView.java

@@ -1,113 +0,0 @@
-package com.shopify.reactnative.skia;
-
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Matrix;
-import android.graphics.PixelFormat;
-import android.hardware.HardwareBuffer;
-import android.media.Image;
-import android.media.ImageReader;
-import android.os.Build;
-import android.util.Log;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.RequiresApi;
-
-@SuppressLint("ViewConstructor")
-@RequiresApi(api = Build.VERSION_CODES.Q)
-public class SkiaAHBView extends View implements ImageReader.OnImageAvailableListener {
-
-    private ImageReader mReader;
-
-    private Bitmap mBitmap = null;
-
-    private final Matrix matrix = new Matrix();
-
-    SkiaViewAPI mApi;
-    boolean mDebug;
-
-    public SkiaAHBView(Context context, SkiaViewAPI api, boolean debug) {
-        super(context);
-        mApi = api;
-        mDebug = debug;
-    }
-
-    private ImageReader createReader() {
-        ImageReader reader = ImageReader.newInstance(getWidth(), getHeight(), PixelFormat.RGBA_8888, 2, HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE |
-                HardwareBuffer.USAGE_GPU_COLOR_OUTPUT);
-        reader.setOnImageAvailableListener(this, null);
-        return reader;
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        super.onLayout(changed, left, top, right, bottom);
-        int width = getWidth();
-        int height = getHeight();
-        if (mReader == null) {
-            mReader = createReader();
-            mApi.onSurfaceCreated(mReader.getSurface(), width, height);
-        } else {
-            mReader = createReader();
-            mApi.onSurfaceChanged(mReader.getSurface(), width, height);
-        }
-    }
-
-    @Override
-    public void onImageAvailable(ImageReader reader) {
-        try (Image image = reader.acquireLatestImage()) {
-            if (image != null) {
-                HardwareBuffer hb = image.getHardwareBuffer();
-                if (mDebug) {
-                    textureUpdated(image.getTimestamp());
-                }
-                if (hb != null) {
-                    Bitmap bitmap = Bitmap.wrapHardwareBuffer(hb, null);
-                    if (bitmap != null) {
-                        mBitmap = bitmap;
-                        hb.close();
-                        invalidate();
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void onDraw(@NonNull Canvas canvas) {
-        super.onDraw(canvas);
-        if (mBitmap != null) {
-            float viewWidth = getWidth();
-            float viewHeight = getHeight();
-            float bitmapWidth = mBitmap.getWidth();
-            float bitmapHeight = mBitmap.getHeight();
-
-            // Calculate the scale factors
-            float scaleX = viewWidth / bitmapWidth;
-            float scaleY = viewHeight / bitmapHeight;
-
-            // Reset the matrix and apply scaling
-            matrix.reset();
-            matrix.setScale(scaleX, scaleY);
-
-            canvas.drawBitmap(mBitmap, matrix, null);
-        }
-    }
-
-    private long _prevTimestamp = 0;
-    public void textureUpdated(long ts) {
-        long frameDuration = (ts - _prevTimestamp)/1000000;
-        Log.i("SkiaAHBView", "onSurfaceTextureUpdated "+frameDuration+"ms");
-        _prevTimestamp = ts;
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        mApi.onSurfaceDestroyed();
-    }
-}