diff options
| -rw-r--r-- | components/servo/Cargo.lock | 10 | ||||
| -rw-r--r-- | ports/cef/Cargo.lock | 12 | ||||
| -rw-r--r-- | ports/glutin/window.rs | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index fd9f2a122f6..8568659072e 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -288,7 +288,7 @@ dependencies = [ [[package]] name = "cocoa" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -881,7 +881,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.23 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2113,12 +2113,12 @@ dependencies = [ [[package]] name = "servo-glutin" -version = "0.4.23" +version = "0.4.25" 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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "cocoa 0.4.4 (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.2 (registry+https://github.com/rust-lang/crates.io-index)", "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2155,7 +2155,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.23 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 055bd808eba..9f7e7e942f5 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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "cocoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "compositing 0.0.1", "devtools 0.0.1", "euclid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -262,7 +262,7 @@ dependencies = [ [[package]] name = "cocoa" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -790,7 +790,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.23 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1998,12 +1998,12 @@ dependencies = [ [[package]] name = "servo-glutin" -version = "0.4.23" +version = "0.4.25" 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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "cocoa 0.4.4 (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.2 (registry+https://github.com/rust-lang/crates.io-index)", "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2040,7 +2040,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.23 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs index e553ae0d188..010c337f01b 100644 --- a/ports/glutin/window.rs +++ b/ports/glutin/window.rs @@ -81,7 +81,6 @@ 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"))] @@ -261,7 +260,8 @@ impl Window { Event::Resized(width, height) => { self.event_queue.borrow_mut().push(WindowEvent::Resize(Size2D::typed(width, height))); } - Event::MouseInput(element_state, mouse_button) => { + Event::MouseInput(element_state, mouse_button, _) => { + // FIXME(#11130, pcwalton): The third field should be used. if mouse_button == MouseButton::Left || mouse_button == MouseButton::Right { let mouse_pos = self.mouse_pos.get(); |