From f62aa8edc27937325f60d1d05b422f8f491a0636 Mon Sep 17 00:00:00 2001 From: Shubham Gupta <32428749+shubhamg13@users.noreply.github.com> Date: Thu, 24 Jul 2025 13:29:18 +0800 Subject: [PATCH] Rename `viewport_zoom` to `pinch_zoom` (#38194) This change is in accordance with highlighting the usage of various zoom options. `pinch_zoom`: `Mobile-style` zoom using pinch gesture `page_zoom`: `Desktop-style` zoom (`Ctrl` + `+`/`-`) It just renames the variable `viewport_zoom` to `pinch_zoom` for better clarity Testing: Testing not required, as it's just renaming of variable . --------- Signed-off-by: Shubham Gupta Signed-off-by: Xiaocheng Hu Co-authored-by: Xiaocheng Hu --- components/compositing/webview_renderer.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/components/compositing/webview_renderer.rs b/components/compositing/webview_renderer.rs index f8e409b2942..e23d7fc55d0 100644 --- a/components/compositing/webview_renderer.rs +++ b/components/compositing/webview_renderer.rs @@ -89,7 +89,7 @@ pub(crate) struct WebViewRenderer { /// "Desktop-style" zoom that resizes the viewport to fit the window. pub page_zoom: Scale, /// "Mobile-style" zoom that does not reflow the page. - viewport_zoom: PinchZoomFactor, + pinch_zoom: PinchZoomFactor, /// The HiDPI scale factor for the `WebView` associated with this renderer. This is controlled /// by the embedding layer. hidpi_scale_factor: Scale, @@ -130,8 +130,8 @@ impl WebViewRenderer { touch_handler: TouchHandler::new(), global, pending_scroll_zoom_events: Default::default(), - page_zoom: Scale::new(1.0), - viewport_zoom: PinchZoomFactor::new(DEFAULT_ZOOM), + page_zoom: Scale::new(DEFAULT_ZOOM), + pinch_zoom: PinchZoomFactor::new(DEFAULT_ZOOM), hidpi_scale_factor: Scale::new(hidpi_scale_factor.0), animating: false, pending_point_input_events: Default::default(), @@ -952,7 +952,7 @@ impl WebViewRenderer { } pub(crate) fn pinch_zoom_level(&self) -> Scale { - Scale::new(self.viewport_zoom.get()) + Scale::new(self.pinch_zoom.get()) } fn set_pinch_zoom_level(&mut self, mut zoom: f32) -> bool { @@ -960,8 +960,8 @@ impl WebViewRenderer { zoom = viewport.clamp_zoom(zoom); } - let old_zoom = std::mem::replace(&mut self.viewport_zoom, PinchZoomFactor::new(zoom)); - old_zoom != self.viewport_zoom + let old_zoom = std::mem::replace(&mut self.pinch_zoom, PinchZoomFactor::new(zoom)); + old_zoom != self.pinch_zoom } pub(crate) fn set_page_zoom(&mut self, magnification: f32) {