From 3dccd1ed2c14b00366154327f40709e26b7f895f Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Wed, 19 Apr 2017 14:07:23 +1000 Subject: [PATCH] Update WR (driver workaround, large clip mask fix, font index support). --- Cargo.lock | 50 ++++++++++++++--------------- components/gfx/font_cache_thread.rs | 4 +-- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 900d1770819..e42926a39ca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -297,7 +297,7 @@ dependencies = [ "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", "offscreen_gl_context 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", - "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -311,7 +311,7 @@ dependencies = [ "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -432,8 +432,8 @@ dependencies = [ "servo_url 0.0.1", "style_traits 0.0.1", "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender 0.33.0 (git+https://github.com/servo/webrender)", - "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", + "webrender 0.35.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -468,7 +468,7 @@ dependencies = [ "servo_remutex 0.0.1", "servo_url 0.0.1", "style_traits 0.0.1", - "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", "webvr_traits 0.0.1", ] @@ -715,7 +715,7 @@ dependencies = [ "servo_geometry 0.0.1", "servo_url 0.0.1", "style_traits 0.0.1", - "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", "x11 2.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1001,7 +1001,7 @@ dependencies = [ "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", "truetype 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", "xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1080,7 +1080,7 @@ dependencies = [ "servo_url 0.0.1", "style_traits 0.0.1", "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1398,7 +1398,7 @@ dependencies = [ "style_traits 0.0.1", "unicode-bidi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1438,7 +1438,7 @@ dependencies = [ "servo_geometry 0.0.1", "servo_url 0.0.1", "style 0.0.1", - "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1452,7 +1452,7 @@ dependencies = [ "profile_traits 0.0.1", "script_traits 0.0.1", "servo_url 0.0.1", - "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1529,8 +1529,8 @@ dependencies = [ "style 0.0.1", "style_traits 0.0.1", "webdriver_server 0.0.1", - "webrender 0.33.0 (git+https://github.com/servo/webrender)", - "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", + "webrender 0.35.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", "webvr 0.0.1", "webvr_traits 0.0.1", ] @@ -1679,7 +1679,7 @@ dependencies = [ "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1723,7 +1723,7 @@ dependencies = [ "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1782,7 +1782,7 @@ dependencies = [ "servo_url 0.0.1", "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -2309,7 +2309,7 @@ dependencies = [ "unicode-segmentation 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", "webvr 0.0.1", "webvr_traits 0.0.1", "xml5ever 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3172,8 +3172,8 @@ dependencies = [ [[package]] name = "webrender" -version = "0.33.0" -source = "git+https://github.com/servo/webrender#f687ff6c3df63a6846f7f96c71c4d76b34f7198e" +version = "0.35.0" +source = "git+https://github.com/servo/webrender#04eeee4593c11a0d9c934722896c67aa5ddd9554" dependencies = [ "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3195,13 +3195,13 @@ dependencies = [ "thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "threadpool 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", ] [[package]] name = "webrender_traits" -version = "0.34.0" -source = "git+https://github.com/servo/webrender#f687ff6c3df63a6846f7f96c71c4d76b34f7198e" +version = "0.35.0" +source = "git+https://github.com/servo/webrender#04eeee4593c11a0d9c934722896c67aa5ddd9554" dependencies = [ "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3226,7 +3226,7 @@ dependencies = [ "msg 0.0.1", "script_traits 0.0.1", "servo_config 0.0.1", - "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", "webvr_traits 0.0.1", ] @@ -3568,8 +3568,8 @@ dependencies = [ "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" "checksum walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "bb08f9e670fab86099470b97cd2b252d6527f0b3cc1401acdb595ffc9dd288ff" "checksum webdriver 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d548aabf87411b1b4ba91fd07eacd8b238135c7131a452b8a9f6386209167e18" -"checksum webrender 0.33.0 (git+https://github.com/servo/webrender)" = "" -"checksum webrender_traits 0.34.0 (git+https://github.com/servo/webrender)" = "" +"checksum webrender 0.35.0 (git+https://github.com/servo/webrender)" = "" +"checksum webrender_traits 0.35.0 (git+https://github.com/servo/webrender)" = "" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" "checksum ws 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "04614a58714f3fd4a8b1da4bcae9f031c532d35988c3d39627619248113f8be8" diff --git a/components/gfx/font_cache_thread.rs b/components/gfx/font_cache_thread.rs index 756d0744843..08863259521 100644 --- a/components/gfx/font_cache_thread.rs +++ b/components/gfx/font_cache_thread.rs @@ -348,9 +348,9 @@ impl FontCache { font_key = Some(*webrender_fonts.entry(template.identifier.clone()).or_insert_with(|| { let font_key = webrender_api.generate_font_key(); match (template.bytes_if_in_memory(), template.native_font()) { - (Some(bytes), _) => webrender_api.add_raw_font(font_key, bytes), + (Some(bytes), _) => webrender_api.add_raw_font(font_key, bytes, 0), (None, Some(native_font)) => webrender_api.add_native_font(font_key, native_font), - (None, None) => webrender_api.add_raw_font(font_key, template.bytes().clone()), + (None, None) => webrender_api.add_raw_font(font_key, template.bytes().clone(), 0), } font_key }));