Bug 1511660 - Update webrender to commit a1758f0fc17a71c8d53387be5e9da42495ee11ae (WR PR #3380). r=kats
authorWR Updater Bot <graphics-team@mozilla.staktrace.com>
Mon, 03 Dec 2018 13:06:45 +0000
changeset 508451 ccf502c02f51b2a3ab97a153902aa050a1b96cbc
parent 508450 b41192e679458ff4fcea290f8dd06326fd828ca1
child 508452 819a462d5dd04f30bc50b47d9e10930ae7b1c627
push id1905
push userffxbld-merge
push dateMon, 21 Jan 2019 12:33:13 +0000
treeherdermozilla-release@c2fca1944d8c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskats
bugs1511660
milestone65.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
Bug 1511660 - Update webrender to commit a1758f0fc17a71c8d53387be5e9da42495ee11ae (WR PR #3380). r=kats https://github.com/servo/webrender/pull/3380 Differential Revision: https://phabricator.services.mozilla.com/D13674
gfx/webrender_bindings/revision.txt
gfx/wr/wrench/Cargo.toml
gfx/wr/wrench/src/main.rs
gfx/wr/wrench/src/wrench.rs
--- a/gfx/webrender_bindings/revision.txt
+++ b/gfx/webrender_bindings/revision.txt
@@ -1,1 +1,1 @@
-6ca634197cfe26738194f87042020fe838c0047a
+a1758f0fc17a71c8d53387be5e9da42495ee11ae
--- a/gfx/wr/wrench/Cargo.toml
+++ b/gfx/wr/wrench/Cargo.toml
@@ -37,10 +37,10 @@ core-foundation = "0.6"
 [features]
 headless = [ "osmesa-sys", "osmesa-src" ]
 pathfinder = [ "webrender/pathfinder" ]
 
 [target.'cfg(target_os = "windows")'.dependencies]
 dwrote = "0.6.2"
 mozangle = {version = "0.1.5", features = ["egl"]}
 
-[target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies]
+[target.'cfg(all(unix, not(target_os = "android")))'.dependencies]
 font-loader = "0.7"
--- a/gfx/wr/wrench/src/main.rs
+++ b/gfx/wr/wrench/src/main.rs
@@ -13,17 +13,17 @@ extern crate core_foundation;
 #[cfg(target_os = "macos")]
 extern crate core_graphics;
 extern crate crossbeam;
 #[cfg(target_os = "windows")]
 extern crate dwrote;
 #[cfg(feature = "env_logger")]
 extern crate env_logger;
 extern crate euclid;
-#[cfg(any(target_os = "linux", target_os = "macos"))]
+#[cfg(all(unix, not(target_os = "android")))]
 extern crate font_loader;
 extern crate gleam;
 extern crate glutin;
 extern crate image;
 #[macro_use]
 extern crate lazy_static;
 #[macro_use]
 extern crate log;
--- a/gfx/wr/wrench/src/wrench.rs
+++ b/gfx/wr/wrench/src/wrench.rs
@@ -3,17 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 
 use app_units::Au;
 use blob;
 use crossbeam::sync::chase_lev;
 #[cfg(windows)]
 use dwrote;
-#[cfg(any(target_os = "linux", target_os = "macos"))]
+#[cfg(all(unix, not(target_os = "android")))]
 use font_loader::system_fonts;
 use winit::EventsLoopProxy;
 use json_frame_writer::JsonFrameWriter;
 use ron_frame_writer::RonFrameWriter;
 use std::collections::HashMap;
 use std::path::PathBuf;
 use std::sync::{Arc, Mutex};
 use std::sync::mpsc::Receiver;
@@ -418,32 +418,43 @@ impl Wrench {
             family_name: family.to_owned(),
             weight,
             style,
             stretch,
         };
         self.font_key_from_native_handle(&desc)
     }
 
-    #[cfg(any(target_os = "linux", target_os = "macos"))]
+    #[cfg(all(unix, not(target_os = "android")))]
     pub fn font_key_from_properties(
         &mut self,
         family: &str,
         _weight: u32,
         _style: u32,
         _stretch: u32,
     ) -> FontKey {
         let property = system_fonts::FontPropertyBuilder::new()
             .family(family)
             .build();
         let (font, index) = system_fonts::get(&property).unwrap();
         self.font_key_from_bytes(font, index as u32)
     }
 
-    #[cfg(unix)]
+    #[cfg(target_os = "android")]
+    pub fn font_key_from_properties(
+        &mut self,
+        family: &str,
+        _weight: u32,
+        _style: u32,
+        _stretch: u32,
+    ) -> FontKey {
+        unimplemented!()
+    }
+
+    #[cfg(all(unix, not(target_os = "android")))]
     pub fn font_key_from_name(&mut self, font_name: &str) -> FontKey {
         let property = system_fonts::FontPropertyBuilder::new()
             .family(font_name)
             .build();
         let (font, index) = system_fonts::get(&property).unwrap();
         self.font_key_from_bytes(font, index as u32)
     }