diff --git a/Cargo.lock b/Cargo.lock index 40a0482c811..3551e3bf186 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3532,7 +3532,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.49.0" -source = "git+https://github.com/servo/webrender#1a7f6eb333a405e3f31f66363301a60649f533fd" +source = "git+https://github.com/servo/webrender#95a4ba0fb673091f7258d929bd2091e629f1c475" dependencies = [ "app_units 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3560,7 +3560,7 @@ dependencies = [ [[package]] name = "webrender_api" version = "0.49.0" -source = "git+https://github.com/servo/webrender#1a7f6eb333a405e3f31f66363301a60649f533fd" +source = "git+https://github.com/servo/webrender#95a4ba0fb673091f7258d929bd2091e629f1c475" dependencies = [ "app_units 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index 89d2fff0c81..8ff38e772c3 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -812,9 +812,9 @@ impl IOCompositor { WindowEvent::ToggleWebRenderDebug(option) => { let mut flags = self.webrender.get_debug_flags(); let flag = match option { - WebRenderDebugOption::Profiler => webrender::renderer::PROFILER_DBG, - WebRenderDebugOption::TextureCacheDebug => webrender::renderer::TEXTURE_CACHE_DBG, - WebRenderDebugOption::RenderTargetDebug => webrender::renderer::RENDER_TARGET_DBG, + WebRenderDebugOption::Profiler => webrender::PROFILER_DBG, + WebRenderDebugOption::TextureCacheDebug => webrender::TEXTURE_CACHE_DBG, + WebRenderDebugOption::RenderTargetDebug => webrender::RENDER_TARGET_DBG, }; flags.toggle(flag); self.webrender.set_debug_flags(flags); diff --git a/components/servo/lib.rs b/components/servo/lib.rs index 65244d68b2d..35cfcef64c6 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -99,7 +99,7 @@ use std::cmp::max; use std::path::PathBuf; use std::rc::Rc; use std::sync::mpsc::{Sender, channel}; -use webrender::renderer::RendererKind; +use webrender::RendererKind; use webvr::{WebVRThread, WebVRCompositorHandler}; pub use gleam::gl; @@ -176,8 +176,8 @@ impl Servo where Window: WindowMethods + 'static { None }; - let mut debug_flags = webrender::renderer::DebugFlags::empty(); - debug_flags.set(webrender::renderer::PROFILER_DBG, opts.webrender_stats); + let mut debug_flags = webrender::DebugFlags::empty(); + debug_flags.set(webrender::PROFILER_DBG, opts.webrender_stats); webrender::Renderer::new(window.gl(), webrender::RendererOptions { device_pixel_ratio: device_pixel_ratio,