diff options
| -rw-r--r-- | Cargo.lock | 57 | ||||
| -rw-r--r-- | components/compositing/compositor.rs | 5 | ||||
| -rw-r--r-- | components/gfx/font_cache_thread.rs | 3 |
3 files changed, 35 insertions, 30 deletions
diff --git a/Cargo.lock b/Cargo.lock index f987ef16fb0..0d771ea371d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -322,8 +322,8 @@ dependencies = [ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", "offscreen_gl_context 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender 0.50.0 (git+https://github.com/servo/webrender)", - "webrender_api 0.50.0 (git+https://github.com/servo/webrender)", + "webrender 0.51.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.51.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -339,7 +339,7 @@ dependencies = [ "offscreen_gl_context 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", - "webrender_api 0.50.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.51.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -490,8 +490,8 @@ dependencies = [ "servo_url 0.0.1", "style_traits 0.0.1", "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender 0.50.0 (git+https://github.com/servo/webrender)", - "webrender_api 0.50.0 (git+https://github.com/servo/webrender)", + "webrender 0.51.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.51.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -527,7 +527,7 @@ dependencies = [ "servo_remutex 0.0.1", "servo_url 0.0.1", "style_traits 0.0.1", - "webrender_api 0.50.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.51.0 (git+https://github.com/servo/webrender)", "webvr_traits 0.0.1", ] @@ -802,7 +802,7 @@ dependencies = [ "servo_geometry 0.0.1", "servo_url 0.0.1", "style_traits 0.0.1", - "webrender_api 0.50.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.51.0 (git+https://github.com/servo/webrender)", "x11 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1125,7 +1125,7 @@ dependencies = [ "truetype 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-bidi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_api 0.50.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.51.0 (git+https://github.com/servo/webrender)", "xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "xml5ever 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1206,7 +1206,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_api 0.50.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.51.0 (git+https://github.com/servo/webrender)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1536,7 +1536,7 @@ dependencies = [ "style_traits 0.0.1", "unicode-bidi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_api 0.50.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.51.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1583,7 +1583,7 @@ dependencies = [ "servo_url 0.0.1", "style 0.0.1", "style_traits 0.0.1", - "webrender_api 0.50.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.51.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1598,7 +1598,7 @@ dependencies = [ "profile_traits 0.0.1", "script_traits 0.0.1", "servo_url 0.0.1", - "webrender_api 0.50.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.51.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1682,8 +1682,8 @@ dependencies = [ "style 0.0.1", "style_traits 0.0.1", "webdriver_server 0.0.1", - "webrender 0.50.0 (git+https://github.com/servo/webrender)", - "webrender_api 0.50.0 (git+https://github.com/servo/webrender)", + "webrender 0.51.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.51.0 (git+https://github.com/servo/webrender)", "webvr 0.0.1", "webvr_traits 0.0.1", ] @@ -1898,7 +1898,7 @@ dependencies = [ "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_api 0.50.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.51.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1956,7 +1956,7 @@ dependencies = [ "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "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)", - "webrender_api 0.50.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.51.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -2013,7 +2013,7 @@ dependencies = [ "servo_url 0.0.1", "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)", - "webrender_api 0.50.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.51.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -2625,7 +2625,7 @@ dependencies = [ "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "utf-8 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_api 0.50.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.51.0 (git+https://github.com/servo/webrender)", "webvr_traits 0.0.1", "xml5ever 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2657,7 +2657,7 @@ dependencies = [ "servo_atoms 0.0.1", "servo_url 0.0.1", "style 0.0.1", - "webrender_api 0.50.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.51.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -2700,7 +2700,7 @@ dependencies = [ "style_traits 0.0.1", "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_api 0.50.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.51.0 (git+https://github.com/servo/webrender)", "webvr_traits 0.0.1", ] @@ -3206,7 +3206,7 @@ dependencies = [ "selectors 0.19.0", "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "servo_atoms 0.0.1", - "webrender_api 0.50.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.51.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -3587,13 +3587,14 @@ dependencies = [ [[package]] name = "webrender" -version = "0.50.0" -source = "git+https://github.com/servo/webrender#68e2e7cd0e39d216bb6c35dfb353dc0700bb6948" +version = "0.51.0" +source = "git+https://github.com/servo/webrender#2a005f156b9f25862a2dc8443b57be37168233f2" dependencies = [ "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.8.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-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)", "core-text 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "dwrote 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3609,13 +3610,13 @@ dependencies = [ "rayon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "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.50.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.51.0 (git+https://github.com/servo/webrender)", ] [[package]] name = "webrender_api" -version = "0.50.0" -source = "git+https://github.com/servo/webrender#68e2e7cd0e39d216bb6c35dfb353dc0700bb6948" +version = "0.51.0" +source = "git+https://github.com/servo/webrender#2a005f156b9f25862a2dc8443b57be37168233f2" dependencies = [ "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4033,8 +4034,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.50.0 (git+https://github.com/servo/webrender)" = "<none>" -"checksum webrender_api 0.50.0 (git+https://github.com/servo/webrender)" = "<none>" +"checksum webrender 0.51.0 (git+https://github.com/servo/webrender)" = "<none>" +"checksum webrender_api 0.51.0 (git+https://github.com/servo/webrender)" = "<none>" "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/compositing/compositor.rs b/components/compositing/compositor.rs index c3388da6f77..35e8a9340ef 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -634,7 +634,10 @@ impl<Window: WindowMethods> IOCompositor<Window> { fn send_window_size(&self, size_type: WindowSizeType) { let dppx = self.page_zoom * self.hidpi_factor(); - self.webrender_api.set_window_parameters(self.webrender_document, self.frame_size, self.window_rect); + self.webrender_api.set_window_parameters(self.webrender_document, + self.frame_size, + self.window_rect, + self.hidpi_factor().get()); let initial_viewport = self.window_rect.size.to_f32() / dppx; diff --git a/components/gfx/font_cache_thread.rs b/components/gfx/font_cache_thread.rs index bde03e78423..39fd210091e 100644 --- a/components/gfx/font_cache_thread.rs +++ b/components/gfx/font_cache_thread.rs @@ -187,7 +187,8 @@ impl FontCache { font_key, size, None, - None); + None, + Vec::new()); webrender_api.update_resources(updates); key }); |