diff --git a/Cargo.lock b/Cargo.lock index c14dfbfe84a..9bfe07e3d52 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3164,7 +3164,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.23.0" -source = "git+https://github.com/servo/webrender#bfef6dbb9fe69a8c408568c85b392186d3853477" +source = "git+https://github.com/servo/webrender#94f255dfae21d9e66041a07f5fbcf2cdd2c73208" dependencies = [ "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.0.0-alpha2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3192,7 +3192,7 @@ dependencies = [ [[package]] name = "webrender_traits" version = "0.24.0" -source = "git+https://github.com/servo/webrender#bfef6dbb9fe69a8c408568c85b392186d3853477" +source = "git+https://github.com/servo/webrender#94f255dfae21d9e66041a07f5fbcf2cdd2c73208" dependencies = [ "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index 12f742e12b9..bbdf1863857 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -1327,7 +1327,7 @@ impl IOCompositor { } fn update_page_zoom_for_webrender(&mut self) { - let page_zoom = webrender_traits::PageZoomFactor::new(self.page_zoom.get()); + let page_zoom = webrender_traits::ZoomFactor::new(self.page_zoom.get()); self.webrender_api.set_page_zoom(page_zoom); } diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index d554b574926..c53b72ba96c 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -31256,7 +31256,7 @@ "support" ], "mozilla/webgl/tex_image_2d_mipmap.html": [ - "80f79d8804ee9cdb2b12c02223bf1e15854122d7", + "b4d54f0f58f75ff622a9c3f9bab3f59d9f1fb0e7", "reftest" ], "mozilla/webgl/tex_image_2d_mipmap_ref.html": [ @@ -31264,7 +31264,7 @@ "support" ], "mozilla/webgl/tex_image_2d_simple.html": [ - "636673ea0aa2a16f4aec362ca40cd82e78ff3396", + "1811000d21dcdb5d27c67afbf22e77a83c6820d6", "reftest" ], "mozilla/webgl/tex_image_2d_simple_ref.html": [