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
This commit is contained in:
Glenn Watson 2017-03-01 11:53:35 -08:00
parent 3d2e706269
commit 0bbde6fc05

View File

@ -1309,6 +1309,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
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<Window: WindowMethods> IOCompositor<Window> {
.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