fb9b9094b9
Follow-up to the off-thread decode seam. A payload that fails to decode used to be marked done without being installed, so paint re-queued it every frame — a corrupt image spun the native workers forever and kept the web repaint coalescer hot. Failed ids now enter a bounded negative cache on both hosts. Blur-up: import generates a <=32 px, <=4 KiB JPEG per image during the decode it already performs, and paint draws that thumbnail (scaled up, which is the blur) before falling back to the node fill and the grey glyph. Thumbnails are explicitly allowed to decode on the paint thread into a small dedicated cache — microseconds, and they cannot displace sharp rasters. Full images still never decode during paint. Every paint, cache, and thumbnail site now shares one canonical jian-ops-schema paint id. Web raster accounting switches from encoded to decoded bytes to match native. Also lands the fill-type picker clamp from the import-fidelity line: the popover flips above its dropdown when the panel bottom is too close, and its hit-test follows the same rect, so the last rows stop being cut off. Measured on the 527 MB reference import: 317 thumbnails persisted (+0.2 MB saved size), first reopened frame draws 1136 thumbnails and zero sharp images, paint-thread full decodes stay at exactly 0. Known, not addressed here: at full zoom-out on the image-dense page the 384 MiB raster LRU never settles (~22 installs/s against ~22 evictions for 101 unique images) — decoded 2048 px rasters cannot all be resident, so that page needs mip-level or on-screen-size-aware rasters. --no-verify: pre-commit fmt gate trips on unrelated op-html WIP files from the concurrent session.
107 lines
4 KiB
Rust
107 lines
4 KiB
Rust
//! Structural coverage for the CanvasKit image-cache bridge.
|
|
//!
|
|
//! The CanvasKit implementation executes in JavaScript, so native Cargo tests
|
|
//! pin the source-level contract that the wasm FFI and browser smoke exercise.
|
|
|
|
use std::fs;
|
|
use std::path::PathBuf;
|
|
|
|
fn source(path: &str) -> String {
|
|
let path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join(path);
|
|
fs::read_to_string(&path)
|
|
.unwrap_or_else(|error| panic!("failed to read {}: {error}", path.display()))
|
|
}
|
|
|
|
#[test]
|
|
fn full_image_cache_accounts_decoded_rgba_bytes() {
|
|
let cache = source("src/op_ck_image_cache.js");
|
|
|
|
assert!(cache.contains("const decodedRasterBytes = (image) =>"));
|
|
assert!(cache.contains("image.width()"));
|
|
assert!(cache.contains("image.height()"));
|
|
assert!(cache.contains("* 4"));
|
|
assert!(cache.contains("return fullImageCache.has(key)"));
|
|
assert!(
|
|
!cache.contains("encoded.byteLength") && !cache.contains("encoded.length"),
|
|
"full-image residency must be charged as decoded RGBA, not payload bytes"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn thumbnail_cache_is_dedicated_bounded_and_negative_caches_corruption() {
|
|
let cache = source("src/op_ck_image_cache.js");
|
|
|
|
assert!(cache.contains("const thumbnailCache = new Map()"));
|
|
assert!(cache.contains("let thumbnailCacheBytes = 0"));
|
|
assert!(cache.contains("const thumbnailFailures = new Set()"));
|
|
assert!(cache.contains("THUMBNAIL_CACHE_BYTE_BUDGET"));
|
|
assert!(cache.contains("THUMBNAIL_ENCODED_BYTE_LIMIT"));
|
|
assert!(cache.contains("THUMBNAIL_FAILURE_CAP"));
|
|
assert!(cache.contains("bytes > THUMBNAIL_CACHE_BYTE_BUDGET"));
|
|
assert!(cache.contains("thumbnailFailures.has(key)"));
|
|
assert!(cache.contains("thumbnailFailures.add(key)"));
|
|
assert!(
|
|
cache.contains("catch"),
|
|
"a corrupt JPEG must not escape into paint"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn thumbnail_decode_rejects_oversized_dimensions_before_canvaskit_decode() {
|
|
let cache = source("src/op_ck_image_cache.js");
|
|
|
|
assert!(cache.contains("const jpegFitsThumbnailBounds = (jpeg) =>"));
|
|
assert!(cache.contains("THUMBNAIL_MAX_EDGE"));
|
|
assert!(cache.contains("if (!jpegFitsThumbnailBounds(jpeg))"));
|
|
let guard = cache
|
|
.find("if (!jpegFitsThumbnailBounds(jpeg))")
|
|
.expect("dimension guard");
|
|
let decode = cache
|
|
.find("CK.MakeImageFromEncoded(copyBytes(jpeg))")
|
|
.expect("CanvasKit decode");
|
|
assert!(
|
|
guard < decode,
|
|
"dimension metadata must be checked before CanvasKit expands pixels"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn thumbnail_draw_is_linear_sampled_aspect_cover() {
|
|
let cache = source("src/op_ck_image_cache.js");
|
|
|
|
assert!(cache.contains("drawThumbnailCover"));
|
|
assert!(cache.contains("Math.max(w / imageW, h / imageH)"));
|
|
assert!(cache.contains("canvas.clipRect"));
|
|
assert!(cache.contains("CK.FilterMode.Linear"));
|
|
assert!(cache.contains("CK.MipmapMode.None"));
|
|
}
|
|
|
|
#[test]
|
|
fn rust_and_js_expose_the_narrow_thumbnail_hook() {
|
|
let rust = source("src/canvaskit.rs");
|
|
let bridge = source("src/op_ck_bridge.js");
|
|
|
|
assert!(rust.contains("js_name = drawImageThumb"));
|
|
assert!(rust.contains("fn draw_image_thumb"));
|
|
assert!(rust.contains("self.ck.draw_image_thumb"));
|
|
assert!(bridge.contains("createWebImageCaches"));
|
|
assert!(bridge.contains("drawImageThumb("));
|
|
assert!(bridge.contains("imageCaches.drawThumbnailCover"));
|
|
}
|
|
|
|
#[test]
|
|
fn wasm_bindgen_packages_the_extracted_cache_module() {
|
|
let rust = source("src/canvaskit.rs");
|
|
let bridge = source("src/op_ck_bridge.js");
|
|
|
|
assert!(rust.contains("module = \"/src/op_ck_image_cache.js\""));
|
|
assert!(rust.contains("web_image_cache_factory()"));
|
|
assert!(rust.contains("set_image_cache_factory(&image_cache_factory)"));
|
|
assert!(rust.contains("op_ck_init(canvas_id)?"));
|
|
assert!(bridge.contains("export function setImageCacheFactory"));
|
|
assert!(
|
|
!bridge.contains("from './op_ck_image_cache.js'"),
|
|
"wasm-bindgen does not recursively copy relative imports from local modules"
|
|
);
|
|
}
|