Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #8887 - mbrubeck:glue-up, r=Ms2ger

Browse source 
Upgrade to android_glue 0.1.3

Fixes scrolling on Android (tomaka/android-rs-glue#70). r? @glennw

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8887)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-12-08 22:03:32 +05:30
commit 5cfba0cb6e
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/servo/Cargo.lock generated
View file

@ -2,7 +2,7 @@
name = "servo" name = "servo"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"android_glue 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas 0.0.1", "canvas 0.0.1",
"canvas_traits 0.0.1", "canvas_traits 0.0.1",
@ -62,7 +62,7 @@ dependencies = [
[[package]] [[package]]
name = "android_glue" name = "android_glue"
version = "0.1.1" version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -1660,7 +1660,7 @@ name = "servo-glutin"
version = "0.4.4" version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"android_glue 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"cgl 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "cgl 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"cocoa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "cocoa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

4
ports/cef/Cargo.lock generated
View file

@ -51,7 +51,7 @@ dependencies = [
[[package]] [[package]]
name = "android_glue" name = "android_glue"
version = "0.1.1" version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -1612,7 +1612,7 @@ name = "servo-glutin"
version = "0.4.4" version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"android_glue 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"cgl 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "cgl 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"cocoa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "cocoa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

4
ports/gonk/Cargo.lock generated
View file

@ -42,7 +42,7 @@ dependencies = [
[[package]] [[package]]
name = "android_glue" name = "android_glue"
version = "0.1.1" version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -1586,7 +1586,7 @@ name = "servo-glutin"
version = "0.4.4" version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"android_glue 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"cgl 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "cgl 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"cocoa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "cocoa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",