diff --git a/render-wasm/src/render.rs b/render-wasm/src/render.rs index 5dc4f570e1..24ffab3e6c 100644 --- a/render-wasm/src/render.rs +++ b/render-wasm/src/render.rs @@ -3043,10 +3043,8 @@ impl RenderState { pub fn get_aligned_tile_bounds(&mut self, tile: tiles::Tile) -> Rect { let scale = self.get_scale(); let device_tile = tiles::device_tile_size_px(self.viewbox.dpr); - let start_tile_x = - (self.viewbox.area.left * scale / device_tile).floor() * device_tile; - let start_tile_y = - (self.viewbox.area.top * scale / device_tile).floor() * device_tile; + let start_tile_x = (self.viewbox.area.left * scale / device_tile).floor() * device_tile; + let start_tile_y = (self.viewbox.area.top * scale / device_tile).floor() * device_tile; Rect::from_xywh( (tile.x() as f32 * device_tile) - start_tile_x, (tile.y() as f32 * device_tile) - start_tile_y, @@ -3851,11 +3849,7 @@ impl RenderState { /// /// Used for the soft settle pass (DPR≤1 fill-rate, one tree walk). The /// sharp HiDPI refill sets `sharp_tile_refill` and skips this path. - fn try_begin_paint_region( - &mut self, - root_ids: &[Uuid], - tree: ShapesPoolRef, - ) -> Result { + fn try_begin_paint_region(&mut self, root_ids: &[Uuid], tree: ShapesPoolRef) -> Result { if self.viewer_masked_pass() || self.options.is_interactive_transform() { return Ok(false); } @@ -3905,11 +3899,7 @@ impl RenderState { // No banding: one paint-once of the whole pending set, or per-tile. // Fit is against GPU max texture — Current is resized to the region below. - if region_tiles.len() == 1 - || !self - .surfaces - .region_fits_paint_surface(area, paint_scale) - { + if region_tiles.len() == 1 || !self.surfaces.region_fits_paint_surface(area, paint_scale) { self.pending_tiles.list.extend(region_tiles); return Ok(false); } @@ -3983,11 +3973,9 @@ impl RenderState { for tile in ®ion.tiles { let tile_doc_rect = tiles::get_tile_rect(*tile, view_scale, self.viewbox.dpr); - let src = self.surfaces.tile_drawable_src_in_region( - tile_doc_rect, - render_area, - paint_scale, - ); + let src = + self.surfaces + .tile_drawable_src_in_region(tile_doc_rect, render_area, paint_scale); let aligned = self.get_aligned_tile_bounds(*tile); self.surfaces.draw_current_src_into_tile_atlas( &self.tile_viewbox, @@ -4555,8 +4543,7 @@ impl RenderState { return export_scale; } let raster = self.surfaces.tile_size_px() as f32; - let world_tile = - tiles::get_tile_size(self.viewbox.get_scale(), self.viewbox.dpr).max(1e-6); + let world_tile = tiles::get_tile_size(self.viewbox.get_scale(), self.viewbox.dpr).max(1e-6); raster / world_tile } diff --git a/render-wasm/src/render/surfaces.rs b/render-wasm/src/render/surfaces.rs index 00f5581bc7..89557dfd56 100644 --- a/render-wasm/src/render/surfaces.rs +++ b/render-wasm/src/render/surfaces.rs @@ -513,8 +513,13 @@ impl Surfaces { // Current + layers cover viewport + interest + blur margins so a // paint-once region pass needs no surface recreate on zoom. - let extra_tile_dims = - paint_surface_dims(width, height, interest_tiles, tile_size_px, max_texture_size); + let extra_tile_dims = paint_surface_dims( + width, + height, + interest_tiles, + tile_size_px, + max_texture_size, + ); let margin = tile_size_px * TILE_SIZE_MULTIPLIER / 4; let margins = skia::ISize::new(margin, margin); @@ -772,12 +777,7 @@ impl Surfaces { self.margins } - pub fn resize( - &mut self, - new_width: i32, - new_height: i32, - interest_tiles: i32, - ) -> Result<()> { + pub fn resize(&mut self, new_width: i32, new_height: i32, interest_tiles: i32) -> Result<()> { let gpu_state = get_gpu_state(); self.reset_from_target(gpu_state.create_target_surface(new_width, new_height)?)?; @@ -1202,10 +1202,7 @@ impl Surfaces { let new_w = needed.width.max(current_w); let new_h = needed.height.max(current_h); if new_w > current_w || new_h > current_h { - let result = self.resize_cache( - skia::ISize::new(new_w, new_h), - interest_area_threshold, - ); + let result = self.resize_cache(skia::ISize::new(new_w, new_h), interest_area_threshold); return result; } Ok(()) @@ -2066,11 +2063,7 @@ impl TileTextureCache { None } - fn farthest_visible_victim( - &self, - tile_viewbox: &TileViewbox, - keep: &Tile, - ) -> Option { + fn farthest_visible_victim(&self, tile_viewbox: &TileViewbox, keep: &Tile) -> Option { let cx = (tile_viewbox.visible_rect.left() + tile_viewbox.visible_rect.right()) / 2; let cy = (tile_viewbox.visible_rect.top() + tile_viewbox.visible_rect.bottom()) / 2; self.grid