servo: Merge #18264 - Update WR (debugger, renderer API changes) (from glennw:update-wr-api); r=KiChjang
authorGlenn Watson <github@intuitionlibrary.com>
Sun, 27 Aug 2017 23:14:05 -0500
changeset 377172 3fb9146be6af389b8886b16b9aa0dce924c24021
parent 377171 859f3f5bfb3d4993d7bf3ceb58baa01c19c1437f
child 377173 a0e215d6e8fcc3c802547efe57267de66adfd559
push id32402
push userarchaeopteryx@coole-files.de
push dateMon, 28 Aug 2017 14:47:04 +0000
treeherdermozilla-central@d5b6d113cf17 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersKiChjang
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
servo: Merge #18264 - Update WR (debugger, renderer API changes) (from glennw:update-wr-api); r=KiChjang Source-Repo: https://github.com/servo/servo Source-Revision: e53bf5d675e195b6bf69e1c78fbb552b3daa80f6
servo/Cargo.lock
servo/components/compositing/compositor.rs
servo/components/servo/lib.rs
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -3527,17 +3527,17 @@ dependencies = [
  "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "webdriver 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[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)",
  "bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-text 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3555,17 +3555,17 @@ dependencies = [
  "thread_profiler 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
  "webrender_api 0.49.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[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)",
  "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "dwrote 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
--- a/servo/components/compositing/compositor.rs
+++ b/servo/components/compositing/compositor.rs
@@ -807,19 +807,19 @@ impl<Window: WindowMethods> IOCompositor
                 if let Err(e) = self.constellation_chan.send(msg) {
                     warn!("Sending reload to constellation failed ({}).", e);
                 }
             }
 
             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);
                 self.webrender_api.generate_frame(self.webrender_document, None);
             }
 
             WindowEvent::NewBrowser(url, response_chan) => {
                 let msg = ConstellationMsg::NewBrowser(url, response_chan);
--- a/servo/components/servo/lib.rs
+++ b/servo/components/servo/lib.rs
@@ -94,17 +94,17 @@ use script_traits::{ConstellationMsg, SW
 use servo_config::opts;
 use servo_config::prefs::PREFS;
 use servo_config::resource_files::resources_dir_path;
 use std::borrow::Cow;
 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;
 pub use servo_config as config;
 pub use servo_url as url;
 pub use msg::constellation_msg::TopLevelBrowsingContextId as BrowserId;
 
 /// The in-process interface to Servo.
@@ -171,18 +171,18 @@ impl<Window> Servo<Window> where Window:
             let recorder = if opts.webrender_record {
                 let record_path = PathBuf::from("wr-record.bin");
                 let recorder = Box::new(webrender::BinaryRecorder::new(&record_path));
                 Some(recorder as Box<webrender::ApiRecordingReceiver>)
             } else {
                 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,
                 resource_override_path: Some(resource_path),
                 enable_aa: opts.enable_text_antialiasing,
                 debug_flags: debug_flags,
                 enable_batcher: opts.webrender_batch,
                 debug: opts.webrender_debug,