diff options
| -rw-r--r-- | Cargo.lock | 14 | ||||
| -rw-r--r-- | components/compositing/compositor.rs | 6 | ||||
| -rw-r--r-- | components/servo/lib.rs | 2 |
3 files changed, 14 insertions, 8 deletions
diff --git a/Cargo.lock b/Cargo.lock index 79aab1417dd..889ea6b1616 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -192,6 +192,11 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "bitflags" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "bitreader" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3595,11 +3600,11 @@ dependencies = [ [[package]] name = "webrender" version = "0.52.1" -source = "git+https://github.com/servo/webrender#eb3ae93bdca0ad4a6281983af53101c578c964cf" +source = "git+https://github.com/servo/webrender#5e30fb4168a22440d91066c246eb16e35eb84e91" dependencies = [ "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3623,11 +3628,11 @@ dependencies = [ [[package]] name = "webrender_api" version = "0.52.1" -source = "git+https://github.com/servo/webrender#eb3ae93bdca0ad4a6281983af53101c578c964cf" +source = "git+https://github.com/servo/webrender#5e30fb4168a22440d91066c246eb16e35eb84e91" dependencies = [ "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3778,6 +3783,7 @@ dependencies = [ "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" "checksum bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1370e9fc2a6ae53aea8b7a5110edbd08836ed87c88736dfabccade1c2b44bff4" "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" +"checksum bitflags 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f5cde24d1b2e2216a726368b2363a273739c91f4e3eb4e0dd12d672d396ad989" "checksum bitreader 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "80b13e2ab064ff3aa0bdbf1eff533f9822dc37899821f5f98c67f263eab51707" "checksum block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" "checksum blurdroid 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d7daba519d29beebfc7d302795af88a16b43f431b9b268586926ac61cc655a68" diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index 85bab91a835..a652346c794 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -1502,9 +1502,9 @@ impl<Window: WindowMethods> IOCompositor<Window> { pub fn toggle_webrender_debug(&mut self, option: WebRenderDebugOption) { let mut flags = self.webrender.get_debug_flags(); let flag = match option { - WebRenderDebugOption::Profiler => webrender::PROFILER_DBG, - WebRenderDebugOption::TextureCacheDebug => webrender::TEXTURE_CACHE_DBG, - WebRenderDebugOption::RenderTargetDebug => webrender::RENDER_TARGET_DBG, + WebRenderDebugOption::Profiler => webrender::DebugFlags::PROFILER_DBG, + WebRenderDebugOption::TextureCacheDebug => webrender::DebugFlags::TEXTURE_CACHE_DBG, + WebRenderDebugOption::RenderTargetDebug => webrender::DebugFlags::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 75b07015037..d5462459e9a 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -183,7 +183,7 @@ impl<Window> Servo<Window> where Window: WindowMethods + 'static { }; let mut debug_flags = webrender::DebugFlags::empty(); - debug_flags.set(webrender::PROFILER_DBG, opts.webrender_stats); + debug_flags.set(webrender::DebugFlags::PROFILER_DBG, opts.webrender_stats); webrender::Renderer::new(window.gl(), webrender::RendererOptions { device_pixel_ratio: device_pixel_ratio, |