From 6ddc0b9476a64f6be3055bfc94bbbe4dff1816a4 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Thu, 2 Jun 2016 16:31:09 -0700 Subject: [PATCH] servo: Update Glutin and WebRender to pick up performance improvements. --- components/servo/Cargo.lock | 28 ++++++++++++++-------------- ports/cef/Cargo.lock | 30 +++++++++++++++--------------- ports/glutin/window.rs | 1 + 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index cba15b83bba..57c0657f55b 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -100,7 +100,7 @@ version = "0.4.5" source = "git+https://github.com/servo/rust-azure#a7177c8df81554352bc51de2f5b77cbb47ec2635" dependencies = [ "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", @@ -273,11 +273,11 @@ dependencies = [ [[package]] name = "cocoa" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -403,7 +403,7 @@ dependencies = [ [[package]] name = "core-graphics" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -417,7 +417,7 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -756,7 +756,7 @@ dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -866,7 +866,7 @@ dependencies = [ "net_traits 0.0.1", "script_traits 0.0.1", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-glutin 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.4.23 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2047,14 +2047,14 @@ dependencies = [ [[package]] name = "servo-glutin" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "cocoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cocoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2089,7 +2089,7 @@ dependencies = [ "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "servo-freetype-sys 2.4.11 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-glutin 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.4.23 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2517,11 +2517,11 @@ dependencies = [ [[package]] name = "webrender" version = "0.1.0" -source = "git+https://github.com/servo/webrender#4ee826b19c23e63ecab7f5a8d0a68faa1f05b70c" +source = "git+https://github.com/servo/webrender#3a6db793d0a2a1c0e55f78ba2ee8ec2772afae6c" dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2544,7 +2544,7 @@ source = "git+https://github.com/servo/webrender_traits#e4cbde9880d118e50de425d3 dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.3 (git+https://github.com/servo/ipc-channel)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 0db9c153a69..f41d0604bf3 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -2,7 +2,7 @@ name = "embedding" version = "0.0.1" dependencies = [ - "cocoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cocoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "compositing 0.0.1", "devtools 0.0.1", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -77,7 +77,7 @@ version = "0.4.5" source = "git+https://github.com/servo/rust-azure#a7177c8df81554352bc51de2f5b77cbb47ec2635" dependencies = [ "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", @@ -250,11 +250,11 @@ dependencies = [ [[package]] name = "cocoa" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -365,7 +365,7 @@ dependencies = [ [[package]] name = "core-graphics" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -379,7 +379,7 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -677,7 +677,7 @@ dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -778,7 +778,7 @@ dependencies = [ "net_traits 0.0.1", "script_traits 0.0.1", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-glutin 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.4.23 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1931,14 +1931,14 @@ dependencies = [ [[package]] name = "servo-glutin" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "cocoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cocoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1973,7 +1973,7 @@ dependencies = [ "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "servo-freetype-sys 2.4.11 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-glutin 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.4.23 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2378,11 +2378,11 @@ dependencies = [ [[package]] name = "webrender" version = "0.1.0" -source = "git+https://github.com/servo/webrender#4ee826b19c23e63ecab7f5a8d0a68faa1f05b70c" +source = "git+https://github.com/servo/webrender#3a6db793d0a2a1c0e55f78ba2ee8ec2772afae6c" dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2405,7 +2405,7 @@ source = "git+https://github.com/servo/webrender_traits#e4cbde9880d118e50de425d3 dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.3 (git+https://github.com/servo/ipc-channel)", diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs index 5677d741f5b..96d5abdae6c 100644 --- a/ports/glutin/window.rs +++ b/ports/glutin/window.rs @@ -81,6 +81,7 @@ fn builder_with_platform_options(mut builder: glutin::WindowBuilder) -> glutin:: builder = builder.with_activation_policy(ActivationPolicy::Prohibited) } builder.with_app_name(String::from("Servo")) + .with_transparent_corner_radius(8) } #[cfg(not(target_os = "macos"))]