Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #18264 - glennw:update-wr-api, r=KiChjang

Browse source 
Update WR (debugger, renderer API changes).

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18264)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-08-27 23:14:05 -05:00 • committed by GitHub
commit e53bf5d675
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -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)",

6
components/compositing/compositor.rs
View file

@ -812,9 +812,9 @@ impl<Window: WindowMethods> IOCompositor<Window> {
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);

6
components/servo/lib.rs
View file

@ -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<Window> Servo<Window> 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,