Merge branch 'main' into lucas/allow-constructing-kittest-node

.github/workflows/rust.yml

@@ -94,7 +94,7 @@ jobs:
       - name: wasm-bindgen
         uses: jetli/wasm-bindgen-action@v0.1.0
         with:
-          version: "0.2.108" # Keep wasm-bindgen version in sync in: setup_web.sh, Cargo.toml, Cargo.lock, rust.yml
+          version: "0.2.126" # Keep wasm-bindgen version in sync in: setup_web.sh, Cargo.toml, Cargo.lock, rust.yml
 
       - run: ./scripts/wasm_bindgen_check.sh --skip-setup
 

Cargo.toml

@@ -71,8 +71,8 @@ egui_kittest = { version = "0.35.0", path = "crates/egui_kittest", default-featu
 eframe = { version = "0.35.0", path = "crates/eframe", default-features = false }
 
 accesskit = "0.24.1"
-accesskit_consumer = "0.35.0"
+accesskit_consumer = "0.35.0" # Can't update to 0.36+: kittest 0.4 pins accesskit_consumer 0.35, so bumping splits it into two versions
-accesskit_winit = "0.32.0"
+accesskit_winit = "0.32.0" # Can't update to 0.33: it needs accesskit_macos 0.26.2, which pulls accesskit_consumer 0.37, duplicating the 0.35 that kittest 0.4 needs
 ahash = { version = "0.8.12", default-features = false, features = [
   "no-rng", # we don't need DOS-protection, so we let users opt-in to it instead
   "std",
@@ -97,12 +97,12 @@ font-types = { version = "0.11.3", default-features = false, features = [
 glow = "0.17.0"
 glutin = { version = "0.32.3", default-features = false }
 glutin-winit = { version = "0.5.0", default-features = false }
-harfrust = "0.7.0" # Can't update to 0.10: it needs read-fonts 0.40/font-types 0.12, but vello_cpu's glifo 0.1.1 pins read-fonts 0.39/font-types 0.11, so bumping duplicates them
+harfrust = "0.7.0" # Can't update to 0.8+: newer versions need read-fonts 0.40+/font-types 0.12, but vello_cpu's glifo 0.1.1 pins read-fonts 0.39/font-types 0.11, so bumping duplicates them
 home = "0.5.12"
 image = { version = "0.25.6", default-features = false } # Can't update to 0.25.7+: it needs png 0.18, which only matches resvg once resvg moves to tiny-skia 0.12 — blocked, see resvg below
-itertools = "0.14.0" # 0.15 splits us from puffin 0.20's itertools 0.14, adding a cargo-deny duplicate
+itertools = "0.15.0"
 jiff = { version = "0.2.29", default-features = false }
-js-sys = "0.3.77"
+js-sys = "0.3.103"
 kittest = { version = "0.4.0" }
 log = { version = "0.4.33", features = ["std"] }
 memoffset = "0.9.1"
@@ -132,7 +132,7 @@ ron = "0.12.2"
 self_cell = "1.2"
 serde = { version = "1.0", features = ["derive"] }
 serde_bytes = "0.11.19"
-similar-asserts = "2.0.0"
+similar-asserts = "2.0"
 skrifa = { version = "0.42.1", default-features = false, features = [
   "std",
   "autohint_shaping",
@@ -144,9 +144,9 @@ syntect = { version = "5.3", default-features = false }
 tempfile = "3.27"
 thiserror = "2.0"
 tokio = "1.52"
-toml = { version = "1.0", default-features = false } # 1.1+ pulls winnow 1.x, duplicating the winnow 0.7 that winit's toml_edit needs
+toml = { version = "1.0", default-features = false }
 type-map = "0.5.1"
-unicode_names2 = { version = "3.1.0", default-features = false }
+unicode_names2 = { version = "3.1", default-features = false }
 unicode-general-category = "1.1"
 unicode-segmentation = "1.13"
 vello_cpu = { version = "0.0.9", default-features = false, features = [
@@ -154,13 +154,13 @@ vello_cpu = { version = "0.0.9", default-features = false, features = [
   "u8_pipeline",
   "f32_pipeline",
 ] }
-wasm-bindgen = "0.2.108" # Keep wasm-bindgen version in sync in: setup_web.sh, Cargo.toml, Cargo.lock, rust.yml. Don't update this spuriously, because of https://github.com/rerun-io/rerun/issues/8766
+wasm-bindgen = "0.2.126" # Keep wasm-bindgen version in sync in: setup_web.sh, Cargo.toml, Cargo.lock, rust.yml. Don't update this spuriously, because of https://github.com/rerun-io/rerun/issues/8766
-wasm-bindgen-futures = "0.4.58"
+wasm-bindgen-futures = "0.4.76"
 wayland-cursor = { version = "0.31.14", default-features = false }
-web-sys = "0.3.77"
+web-sys = "0.3.103"
 web-time = "1.1" # Timekeeping for native and web
 webbrowser = "1.2"
-wgpu = { version = "29.0", default-features = false, features = ["std"] }
+wgpu = { version = "30.0", default-features = false, features = ["std"] }
 windows-sys = "0.61.2"
 winit = { version = "0.30.13", default-features = false }
 

crates/eframe/Cargo.toml

@@ -232,6 +232,7 @@ web-sys = { workspace = true, features = [
   "File",
   "FileList",
   "FocusEvent",
+  "FocusOptions",
   "HtmlCanvasElement",
   "HtmlElement",
   "HtmlInputElement",

crates/eframe/src/web/app_runner.rs

@@ -401,7 +401,7 @@ impl AppRunner {
             } else {
                 // We are not editing text - give the focus to the canvas.
                 self.text_agent.blur();
-                self.canvas().focus().ok();
+                super::focus_without_scroll(self.canvas()).ok();
             }
         }
 

crates/eframe/src/web/events.rs

@@ -599,7 +599,7 @@ fn install_pointerup(runner_ref: &WebRunner, target: &EventTarget) -> Result<(),
                 // not working when focusing on a text field in an egui app.
                 // This attempts to fix that by forcing the focus on any
                 // click on the canvas.
-                runner.canvas().focus().ok();
+                super::focus_without_scroll(runner.canvas()).ok();
 
                 // In Safari we are only allowed to do certain things
                 // (like playing audio, start a download, etc)

crates/eframe/src/web/mod.rs

@@ -84,6 +84,17 @@ pub(crate) fn has_focus<T: JsCast>(element: &T) -> bool {
     try_has_focus(element).unwrap_or(false)
 }
 
+/// Focus the given element without scrolling it into view.
+///
+/// Scrolling the element into view would scroll the whole page when
+/// the app is embedded in a larger scrollable page,
+/// see <https://github.com/emilk/egui/issues/8295>.
+pub(crate) fn focus_without_scroll(element: &web_sys::HtmlElement) -> Result<(), JsValue> {
+    let options = web_sys::FocusOptions::new();
+    options.set_prevent_scroll(true);
+    element.focus_with_options(&options)
+}
+
 /// Current time in seconds (since undefined point in time).
 ///
 /// Monotonically increasing.

crates/eframe/src/web/text_agent.rs

@@ -4,7 +4,7 @@
 use std::cell::Cell;
 
 use wasm_bindgen::prelude::*;
-use web_sys::{Document, Node};
+use web_sys::Document;
 
 use super::{AppRunner, WebRunner};
 
@@ -15,19 +15,23 @@ pub struct TextAgent {
 
 impl TextAgent {
     /// Attach the agent to the document.
-    pub fn attach(runner_ref: &WebRunner, root: Node) -> Result<Self, JsValue> {
+    pub fn attach(
+        runner_ref: &WebRunner,
+        canvas: &web_sys::HtmlCanvasElement,
+    ) -> Result<Self, JsValue> {
         let document = web_sys::window().unwrap().document().unwrap();
 
         // create an `<input>` element
         let input = document
             .create_element("input")?
-            .dyn_into::<web_sys::HtmlElement>()?;
+            .dyn_into::<web_sys::HtmlInputElement>()?;
-        input.set_autofocus(true)?;
-        let input = input.dyn_into::<web_sys::HtmlInputElement>()?;
         input.set_type("text");
         input.set_attribute("autocapitalize", "off")?;
 
-        // append it to `<body>` and hide it outside of the viewport
+        // Hide the element, and park it over the canvas
+        // so that focusing it can never scroll some other part
+        // of the page into view.
+        let canvas_rect = super::canvas_content_rect(canvas);
         let style = input.style();
         style.set_property("background-color", "transparent")?;
         style.set_property("border", "none")?;
@@ -36,11 +40,12 @@ impl TextAgent {
         style.set_property("height", "1px")?;
         style.set_property("caret-color", "transparent")?;
         style.set_property("position", "absolute")?;
-        style.set_property("top", "0")?;
+        style.set_property("top", &format!("{}px", canvas_rect.min.y))?;
-        style.set_property("left", "0")?;
+        style.set_property("left", &format!("{}px", canvas_rect.min.x))?;
         // Prevent auto-zoom on mobile browsers (requires at least 16px).
         style.set_property("font-size", "16px")?;
 
+        let root = canvas.get_root_node();
         if root.has_type::<Document>() {
             // root object is a document, append to its body
             root.dyn_into::<Document>()?
@@ -52,6 +57,13 @@ impl TextAgent {
             root.append_child(&input)?;
         }
 
+        // Focus the app on startup, without scrolling the page.
+        // We do this instead of setting the `autofocus` attribute,
+        // since the browser scrolls the focused element into view when
+        // honoring `autofocus`, and there is no way to prevent that.
+        // See https://github.com/emilk/egui/issues/8295
+        super::focus_without_scroll(&input).ok();
+
         // attach event listeners
 
         let on_input = {
@@ -67,7 +79,7 @@ impl TextAgent {
                 // between versions 14.7.09 and 17.0.12.
                 if !event.is_composing() {
                     input.blur().ok();
-                    input.focus().ok();
+                    super::focus_without_scroll(&input).ok();
                 }
 
                 if event.is_composing() {
@@ -221,7 +233,7 @@ impl TextAgent {
 
         log::trace!("Focusing text agent");
 
-        if let Err(err) = self.input.focus() {
+        if let Err(err) = super::focus_without_scroll(&self.input) {
             log::error!("failed to set focus: {}", super::string_from_js_value(&err));
         }
     }

crates/eframe/src/web/web_painter_wgpu.rs

@@ -380,7 +380,7 @@ impl WebPainter for WebPainterWgpu {
                 );
             }
 
-            frame.present();
+            render_state.queue.present(frame);
         }
 
         // Free textures marked for destruction **after** queue submit since they might still be used in the current frame.

crates/eframe/src/web/web_runner.rs

@@ -73,7 +73,7 @@ impl WebRunner {
 
         {
             // First set up the app runner:
-            let text_agent = TextAgent::attach(self, canvas.get_root_node())?;
+            let text_agent = TextAgent::attach(self, &canvas)?;
             let app_runner =
                 AppRunner::new(canvas.clone(), web_options, app_creator, text_agent).await?;
             self.app_runner.replace(Some(app_runner));

crates/egui-wgpu/src/capture.rs

@@ -212,10 +212,14 @@ impl CaptureState {
             let buffer_slice = buffer.slice(..);
 
             let mut pixels = Vec::with_capacity((tex_extent.width * tex_extent.height) as usize);
-            for padded_row in buffer_slice
+            let mapped_range = match buffer_slice.get_mapped_range() {
-                .get_mapped_range()
+                Ok(range) => range,
-                .chunks(padding.padded_bytes_per_row as usize)
+                Err(err) => {
-            {
+                    log::error!("Failed to get mapped range for reading: {err}");
+                    return;
+                }
+            };
+            for padded_row in mapped_range.chunks(padding.padded_bytes_per_row as usize) {
                 let row = &padded_row[..padding.unpadded_bytes_per_row as usize];
                 for color in row.chunks(4) {
                     pixels.push(epaint::Color32::from_rgba_premultiplied(

crates/egui-wgpu/src/lib.rs

@@ -150,6 +150,7 @@ async fn request_adapter(
             // * fails if there's no software rasterizer available
             // * can achieve the same with `native_adapter_selector`
             force_fallback_adapter: false,
+            apply_limit_buckets: false,
         })
         .await
         .inspect_err(|_err| {
@@ -473,6 +474,7 @@ pub fn adapter_info_summary(info: &wgpu::AdapterInfo) -> String {
         subgroup_min_size,
         subgroup_max_size,
         transient_saves_memory,
+        limit_bucket,
     } = &info;
 
     // Example values:
@@ -523,9 +525,10 @@ pub fn adapter_info_summary(info: &wgpu::AdapterInfo) -> String {
     }
     write!(
         summary,
-        ", transient_saves_memory: {transient_saves_memory}"
+        ", transient_saves_memory: {transient_saves_memory:?}"
     )
     .ok();
+    write!(summary, ", limit_bucket: {limit_bucket:?}").ok();
 
     summary
 }

crates/egui-wgpu/src/renderer.rs

@@ -375,14 +375,14 @@ impl Renderer {
                 vertex: wgpu::VertexState {
                     entry_point: Some("vs_main"),
                     module: &module,
-                    buffers: &[wgpu::VertexBufferLayout {
+                    buffers: &[Some(wgpu::VertexBufferLayout {
                         array_stride: 5 * 4,
                         step_mode: wgpu::VertexStepMode::Vertex,
                         // 0: vec2 position
                         // 1: vec2 texture coordinates
                         // 2: uint color
                         attributes: &wgpu::vertex_attr_array![0 => Float32x2, 1 => Float32x2, 2 => Uint32],
-                    }],
+                    })],
                     compilation_options: wgpu::PipelineCompilationOptions::default()
                 },
                 primitive: wgpu::PrimitiveState {

crates/egui-wgpu/src/setup.rs

@@ -39,6 +39,7 @@ where
 }
 
 #[derive(Clone)]
+#[expect(clippy::large_enum_variant)]
 pub enum WgpuSetup {
     /// Construct a wgpu setup using some predefined settings & heuristics.
     /// This is the default option. You can customize most behaviours overriding the

crates/egui-wgpu/src/winit.rs

@@ -765,7 +765,7 @@ impl Painter {
             profiling::scope!("present");
             // wgpu doesn't document where vsync can happen. Maybe here?
             let start = web_time::Instant::now();
-            output_frame.present();
+            render_state.queue.present(output_frame);
             vsync_sec += start.elapsed().as_secs_f32();
         }
 

crates/egui_demo_app/src/backend_panel.rs

@@ -223,6 +223,7 @@ fn integration_ui(ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
                 subgroup_min_size,
                 subgroup_max_size,
                 transient_saves_memory,
+                limit_bucket,
             } = &info;
 
             // Example values:
@@ -276,7 +277,11 @@ fn integration_ui(ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
                     ui.end_row();
                 }
                 ui.label("Transient saves memory:");
-                ui.label(format!("{transient_saves_memory}"));
+                ui.label(format!("{transient_saves_memory:?}"));
+                ui.end_row();
+
+                ui.label("Limit bucket:");
+                ui.label(format!("{limit_bucket:?}"));
                 ui.end_row();
             });
         };

crates/egui_kittest/src/texture_to_image.rs

@@ -58,7 +58,9 @@ pub(crate) fn texture_to_image(device: &Device, queue: &Queue, texture: &Texture
 
     receiver.recv().unwrap().unwrap();
     let buffer_slice = output_buffer.slice(..);
-    let data = buffer_slice.get_mapped_range();
+    let data = buffer_slice
+        .get_mapped_range()
+        .expect("Failed to get mapped range");
     let data = data
         .chunks_exact(buffer_dimensions.padded_bytes_per_row)
         .flat_map(|row| row.iter().take(buffer_dimensions.unpadded_bytes_per_row))

deny.toml

@@ -33,6 +33,9 @@ version = 2
 ignore = [
   "RUSTSEC-2024-0320", # unmaintained yaml-rust pulled in by syntect
   "RUSTSEC-2025-0141", # https://rustsec.org/advisories/RUSTSEC-2025-0141 - bincode is unmaintained - https://git.sr.ht/~stygianentity/bincode/tree/v3.0/item/README.md
+  "RUSTSEC-2026-0192", # ttf-parser is unmaintained. Only brought in via winit/sctk-adwaita (wayland window frame rendering)
+  "RUSTSEC-2026-0194", # quick-xml DoS - fix is in >=0.41, but held back transitively by zbus_xml (accesskit) and wayland-scanner (winit)
+  "RUSTSEC-2026-0195", # quick-xml DoS - same as above
 ]
 
 [bans]
@@ -52,11 +55,13 @@ skip = [
   { name = "foldhash" }, # pulled by the duplicated hashbrown versions
   { name = "getrandom" }, # ring / rustls (and thus ehttp) still depend on getrandom 0.2
   { name = "hashbrown" }, # wgpu's naga depends on 0.16, accesskit depends on 0.15
+  { name = "itertools" }, # puffin 0.20 depends on 0.14, criterion 0.8 on 0.13
   { name = "jni-sys" }, # 0.3.1 depends on 0.4
   { name = "kurbo" }, # Old version because of resvg
   { name = "phf" }, # mime_guess2 -> 0.11, unicode_names2 -> 0.13
   { name = "phf_generator" }, # same phf split as phf
   { name = "phf_shared" }, # same phf split as phf
+  { name = "rand_core" }, # rand ecosystem is migrating 0.8 -> 0.10; phf_generator's rand 0.8 needs rand_core 0.6, getrandom 0.4/chacha20 need rand_core 0.10
   { name = "redox_syscall" }, # old version via winit
   { name = "rustc-hash" }, # Small enough
   { name = "thiserror" }, # ecosystem is in the process of migrating from 1.x to 2.x
@@ -111,6 +116,4 @@ license-files = [{ path = "LICENSE", hash = 0xbd0eed23 }]
 unknown-registry = "deny"
 unknown-git = "deny"
 
-allow-git = [
+allow-git = []
-  "https://github.com/rerun-io/kittest", # TODO(lucasmerlin): remove this once the kittest crate is published"
-]

scripts/setup_web.sh

@@ -10,6 +10,6 @@ rustup target add wasm32-unknown-unknown
 
 # For generating JS bindings:
 # Keep wasm-bindgen version in sync in: setup_web.sh, Cargo.toml, Cargo.lock, rust.yml
-if ! cargo install --list | grep -q 'wasm-bindgen-cli v0.2.108'; then
+if ! cargo install --list | grep -q 'wasm-bindgen-cli v0.2.126'; then
-    cargo install --force --quiet wasm-bindgen-cli --version 0.2.108 --locked
+    cargo install --force --quiet wasm-bindgen-cli --version 0.2.126 --locked
 fi