From 0bbde6fc0561eed95bb25ebfc5c8e5c772f7e780 Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Wed, 1 Mar 2017 11:53:35 -0800 Subject: [PATCH] servo: Merge #15762 - Add support for page zoom via new WR API (from glennw:basic-page-zoom); r=mbrubeck Source-Repo: https://github.com/servo/servo Source-Revision: 67638bdcf27f9bb899059d1e2f8e907f7462cad6 --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : de988e53773a59aec33385fe4fb6f80eee40735b --- servo/components/compositing/compositor.rs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/servo/components/compositing/compositor.rs b/servo/components/compositing/compositor.rs index f31fa1230752..dc3313fb595a 100644 --- a/servo/components/compositing/compositor.rs +++ b/servo/components/compositing/compositor.rs @@ -1309,6 +1309,7 @@ impl IOCompositor { self.page_zoom = ScaleFactor::new(1.0); self.update_zoom_transform(); self.send_window_size(WindowSizeType::Resize); + self.update_page_zoom_for_webrender(); } fn on_zoom_window_event(&mut self, magnification: f32) { @@ -1316,6 +1317,12 @@ impl IOCompositor { .max(MIN_ZOOM).min(MAX_ZOOM)); self.update_zoom_transform(); self.send_window_size(WindowSizeType::Resize); + self.update_page_zoom_for_webrender(); + } + + fn update_page_zoom_for_webrender(&mut self) { + let page_zoom = webrender_traits::PageZoomFactor::new(self.page_zoom.get()); + self.webrender_api.set_page_zoom(page_zoom); } /// Simulate a pinch zoom