Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-16 10:55:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update rustc to 00b112c45a604fa6f4b59af2a40c9deeadfdb7c6/rustc-1.0.0-dev.

Browse source
This commit is contained in:
Josh Matthews 2015-01-15 13:26:44 -05:00 • committed by Glenn Watson
parent ff8cbff810
commit 95fc29fa0d
255 changed files with 3550 additions and 3362 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ports/cef/.cargo/config
View file

@ -1,7 +1 @@
# FIXME: Remove this next rustup. This is a temporary
# hack to allow android cross compilation to work. When
# this is removed, the support/time submodule can also
# be removed!
paths = [
"../../support/time"
]

377
ports/cef/Cargo.lock generated
View file

@ -26,7 +26,7 @@ dependencies = [
[[package]]
name = "android_glue"
version = "0.0.1"
source = "git+https://github.com/servo/android-rs-glue?ref=servo#122bc28545b5e59a923c466a484c403fa691bd55"
source = "git+https://github.com/tomaka/android-rs-glue#7e930d2822adb791a515c24dfefe6ae37493f40f"
dependencies = [
"compile_msg 0.1.3 (git+https://github.com/huonw/compile_msg)",
]
@ -34,7 +34,7 @@ dependencies = [
[[package]]
name = "azure"
version = "0.1.0"
source = "git+https://github.com/servo/rust-azure#d0acabef6221e5fd6840254dc23f91c66b874629"
source = "git+https://github.com/servo/rust-azure#2cc22b161a93f4016457f680b3966d879606d06d"
dependencies = [
"core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
"core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
@ -42,7 +42,7 @@ dependencies = [
"egl 0.1.0 (git+https://github.com/servo/rust-egl)",
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"skia-sys 0.0.20130412 (git+https://github.com/servo/skia?ref=upstream-2014-06-16)",
"skia-sys 0.0.20130412 (git+https://github.com/servo/skia?branch=upstream-2014-06-16)",
"xlib 0.1.0 (git+https://github.com/servo/rust-xlib)",
]
@ -66,7 +66,7 @@ dependencies = [
[[package]]
name = "cocoa"
version = "0.1.1"
source = "git+https://github.com/servo/rust-cocoa#bf53a53ce306279fc1cae0d56fdd5e7216696420"
source = "git+https://github.com/servo/rust-cocoa#84a405ba9ff2a79d507dc6ee1ea3cf9bf48706d1"
[[package]]
name = "compile_msg"
@ -91,25 +91,26 @@ dependencies = [
"net 0.0.1",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
"script_traits 0.0.1",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"url 0.2.4 (git+https://github.com/servo/rust-url)",
"time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
[[package]]
name = "cookie"
version = "0.1.0"
source = "git+https://github.com/alexcrichton/cookie-rs#8d1b4bb8d5ed06e58c162eb235a4ccd210b68108"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"openssl 0.2.4 (git+https://github.com/sfackler/rust-openssl)",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"url 0.2.4 (git+https://github.com/servo/rust-url)",
"openssl 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "core_foundation"
version = "0.1.0"
source = "git+https://github.com/servo/rust-core-foundation#81db9ab15f67e16d7a3e9705a06cad65192014fd"
source = "git+https://github.com/servo/rust-core-foundation#ce3d852765827b64a0d5fb2aadd77da39665b0b0"
[[package]]
name = "core_graphics"
@ -122,7 +123,7 @@ dependencies = [
[[package]]
name = "core_text"
version = "0.1.0"
source = "git+https://github.com/servo/rust-core-text#cb369a26a0eb4e83c2128ceb3c685a191113417a"
source = "git+https://github.com/servo/rust-core-text#b5cb33905350e99b2a19f5a22f7b1efea7ad48c2"
dependencies = [
"core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
"core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
@ -130,12 +131,12 @@ dependencies = [
[[package]]
name = "cssparser"
version = "0.1.1"
source = "git+https://github.com/servo/rust-cssparser#8d1b3e220e795f7baaa940919059d5f4ef4ec28c"
version = "0.2.0"
source = "git+https://github.com/servo/rust-cssparser#2a8c9f2c5f568495bae16f44b799be39b8efad39"
dependencies = [
"encoding 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"matches 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"text_writer 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"text_writer 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -157,63 +158,63 @@ dependencies = [
[[package]]
name = "egl"
version = "0.1.0"
source = "git+https://github.com/servo/rust-egl#88f2a13812ddbce2bf2317221663a61c31b3e220"
source = "git+https://github.com/servo/rust-egl#cd74c82a8537090edb6c16478e2261db2a8c0b4f"
[[package]]
name = "encoding"
version = "0.2.6"
version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"encoding-index-japanese 1.0.20140915 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding-index-korean 1.0.20140915 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding-index-simpchinese 1.0.20140915 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding-index-singlebyte 1.0.20140915 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding-index-tradchinese 1.0.20140915 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding-index-japanese 1.20141219.0 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding-index-korean 1.20141219.0 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding-index-simpchinese 1.20141219.0 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding-index-singlebyte 1.20141219.0 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding-index-tradchinese 1.20141219.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "encoding-index-japanese"
version = "1.0.20140915"
version = "1.20141219.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"encoding_index_tests 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding_index_tests 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "encoding-index-korean"
version = "1.0.20140915"
version = "1.20141219.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"encoding_index_tests 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding_index_tests 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "encoding-index-simpchinese"
version = "1.0.20140915"
version = "1.20141219.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"encoding_index_tests 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding_index_tests 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "encoding-index-singlebyte"
version = "1.0.20140915"
version = "1.20141219.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"encoding_index_tests 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding_index_tests 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "encoding-index-tradchinese"
version = "1.0.20140915"
version = "1.20141219.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"encoding_index_tests 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding_index_tests 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "encoding_index_tests"
version = "0.1.0"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@ -241,7 +242,7 @@ dependencies = [
[[package]]
name = "freetype"
version = "0.1.0"
source = "git+https://github.com/servo/rust-freetype#e55b06110fb2d74a2db68ead740db7e98fb98060"
source = "git+https://github.com/servo/rust-freetype#ec0231343a3ad360d86846c12895a0a0cbb19f79"
[[package]]
name = "freetype-sys"
@ -250,18 +251,18 @@ source = "git+https://github.com/servo/libfreetype2#f5c49c0da1d5bc6b206c41763440
[[package]]
name = "gcc"
version = "0.1.1"
source = "git+https://github.com/alexcrichton/gcc-rs#dfe97a119af4b2db53178eb8c3ca6be6589a152b"
version = "0.1.4"
source = "git+https://github.com/alexcrichton/gcc-rs#f5c52d956e0742a66e40c8301e634e136c3ae287"
[[package]]
name = "gcc"
version = "0.1.2"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "geom"
version = "0.1.0"
source = "git+https://github.com/servo/rust-geom#05f2d5494355adc78ad7d17286912f0d128f503b"
source = "git+https://github.com/servo/rust-geom#a4a4a03aa024412bf3f4e093c0198b433c6ad63f"
[[package]]
name = "gfx"
@ -283,45 +284,65 @@ dependencies = [
"script_traits 0.0.1",
"stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
"style 0.0.1",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"url 0.2.4 (git+https://github.com/servo/rust-url)",
"time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
[[package]]
name = "gl_common"
version = "0.0.1"
source = "git+https://github.com/bjz/gl-rs.git#b5e3f4f76c31bc1b459d5e4c10d879ffa4f67c6e"
version = "0.0.3"
source = "git+https://github.com/bjz/gl-rs.git#230e6c9ed611cddfcb6682dee9686471d54863d0"
[[package]]
name = "gl_common"
version = "0.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "gl_generator"
version = "0.0.1"
source = "git+https://github.com/bjz/gl-rs.git#b5e3f4f76c31bc1b459d5e4c10d879ffa4f67c6e"
version = "0.0.12"
source = "git+https://github.com/bjz/gl-rs.git#230e6c9ed611cddfcb6682dee9686471d54863d0"
dependencies = [
"gl_common 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
"khronos_api 0.0.2 (git+https://github.com/bjz/gl-rs.git)",
"xml-rs 0.1.3 (git+https://github.com/netvl/xml-rs)",
"gl_common 0.0.3 (git+https://github.com/bjz/gl-rs.git)",
"khronos_api 0.0.5 (git+https://github.com/bjz/gl-rs.git)",
"log 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xml-rs 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "gl_generator"
version = "0.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"gl_common 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"khronos_api 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xml-rs 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "gleam"
version = "0.0.1"
source = "git+https://github.com/servo/gleam#c54eb9ad6d4b62b7effbe9c79a1b3720845b45b4"
source = "git+https://github.com/servo/gleam#8a23e963c5b8e1a727a80fb009d71e2f9efb6a89"
dependencies = [
"gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
"gl_common 0.0.3 (git+https://github.com/bjz/gl-rs.git)",
"gl_generator 0.0.12 (git+https://github.com/bjz/gl-rs.git)",
]
[[package]]
name = "glutin"
version = "0.0.2"
source = "git+https://github.com/servo/glutin?ref=servo#ec6b4d0fff12ef607db422508ae005ba91406f5b"
version = "0.0.4-pre"
source = "git+https://github.com/tomaka/glutin#1d6b863cd454839b8e3cf1e296cbf8f31fb70029"
dependencies = [
"android_glue 0.0.1 (git+https://github.com/servo/android-rs-glue?ref=servo)",
"android_glue 0.0.1 (git+https://github.com/tomaka/android-rs-glue)",
"cocoa 0.1.1 (git+https://github.com/servo/rust-cocoa)",
"core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
"core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
"gl_common 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
"gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
"winapi 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"gl_common 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"gl_generator 0.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
"khronos_api 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -330,21 +351,23 @@ version = "0.0.1"
dependencies = [
"cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
"compositing 0.0.1",
"egl 0.1.0 (git+https://github.com/servo/rust-egl)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"glutin 0.0.2 (git+https://github.com/servo/glutin?ref=servo)",
"glutin 0.0.4-pre (git+https://github.com/tomaka/glutin)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"msg 0.0.1",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
[[package]]
name = "glx"
version = "0.0.1"
source = "git+https://github.com/servo/rust-glx#7126ffa09fcfcc9f85f1406f3b5db729f5fdb7c3"
source = "git+https://github.com/servo/rust-glx#f056a8998987f6f081f9ad7fa396beb1b2988c02"
dependencies = [
"gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
"gl_common 0.0.3 (git+https://github.com/bjz/gl-rs.git)",
"gl_generator 0.0.12 (git+https://github.com/bjz/gl-rs.git)",
]
[[package]]
@ -355,33 +378,36 @@ source = "git+https://github.com/servo/rust-harfbuzz#59b5b18087418404d661784934c
[[package]]
name = "html5ever"
version = "0.0.0"
source = "git+https://github.com/servo/html5ever#0abe5e30cc03f9e73bfd4fdc018192d149c21fb3"
source = "git+https://github.com/servo/html5ever#d35dfaaf0d85007057a299afc370d07e92538944"
dependencies = [
"html5ever_macros 0.0.0 (git+https://github.com/servo/html5ever)",
"phf 0.0.1 (git+https://github.com/sfackler/rust-phf)",
"phf_mac 0.0.1 (git+https://github.com/sfackler/rust-phf)",
"phf 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
"phf_mac 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.0.0 (git+https://github.com/servo/string-cache)",
"string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache)",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "html5ever_macros"
version = "0.0.0"
source = "git+https://github.com/servo/html5ever#0abe5e30cc03f9e73bfd4fdc018192d149c21fb3"
source = "git+https://github.com/servo/html5ever#d35dfaaf0d85007057a299afc370d07e92538944"
[[package]]
name = "hyper"
version = "0.0.1"
source = "git+https://github.com/servo/hyper?ref=servo#43becc919c24939b8b84fe541b0e0898a4827836"
version = "0.1.0"
source = "git+https://github.com/servo/hyper?branch=servo#248a6f29086baa841eb30c88540dca3196accae4"
dependencies = [
"cookie 0.1.0 (git+https://github.com/alexcrichton/cookie-rs)",
"mime 0.0.1 (git+https://github.com/hyperium/mime.rs)",
"mucell 0.1.2 (git+https://github.com/chris-morgan/mucell)",
"openssl 0.2.4 (git+https://github.com/sfackler/rust-openssl)",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"unsafe-any 0.1.1 (git+https://github.com/reem/rust-unsafe-any)",
"url 0.2.4 (git+https://github.com/servo/rust-url)",
"cookie 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"mime 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
"mucell 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
"unicase 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"unsafe-any 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -398,20 +424,25 @@ dependencies = [
[[package]]
name = "js"
version = "0.1.0"
source = "git+https://github.com/servo/rust-mozjs#5a69e377d6ab7ea8601f711443994f1c8172c7a8"
source = "git+https://github.com/servo/rust-mozjs#6cabb12f858f27d23fc3d2d9f0c334b80eb56573"
dependencies = [
"mozjs-sys 0.0.0 (git+https://github.com/servo/mozjs)",
]
[[package]]
name = "khronos_api"
version = "0.0.2"
source = "git+https://github.com/bjz/gl-rs.git#b5e3f4f76c31bc1b459d5e4c10d879ffa4f67c6e"
version = "0.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "khronos_api"
version = "0.0.5"
source = "git+https://github.com/bjz/gl-rs.git#230e6c9ed611cddfcb6682dee9686471d54863d0"
[[package]]
name = "layers"
version = "0.1.0"
source = "git+https://github.com/servo/rust-layers#f20270839f8658a2b19eae6fade9325efe5f4578"
source = "git+https://github.com/servo/rust-layers#84d6d2cd2d09489eb10af7167fa34c914a8bee71"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
@ -428,8 +459,9 @@ dependencies = [
name = "layout"
version = "0.0.1"
dependencies = [
"cssparser 0.1.1 (git+https://github.com/servo/rust-cssparser)",
"encoding 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas 0.0.1",
"cssparser 0.2.0 (git+https://github.com/servo/rust-cssparser)",
"encoding 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gfx 0.0.1",
"layout_traits 0.0.1",
@ -440,7 +472,7 @@ dependencies = [
"string_cache 0.0.0 (git+https://github.com/servo/string-cache)",
"string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache)",
"style 0.0.1",
"url 0.2.4 (git+https://github.com/servo/rust-url)",
"url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@ -457,8 +489,8 @@ dependencies = [
[[package]]
name = "lazy_static"
version = "0.1.0"
source = "git+https://github.com/Kimundi/lazy-static.rs#76f06e4fa7bc8c92f11d1def19bd4ddfd8017cd8"
version = "0.1.6"
source = "git+https://github.com/Kimundi/lazy-static.rs#31a7aa0176ecd70b4aab274a40d1e2cd78c1fbf8"
[[package]]
name = "libressl-pnacl-sys"
@ -468,15 +500,26 @@ dependencies = [
"pnacl-build-helper 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "log"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"regex 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "matches"
version = "0.1.0"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "mime"
version = "0.0.1"
source = "git+https://github.com/hyperium/mime.rs#7898f1c29c7f5d35d0c3c7aed37ebcfc95a40873"
version = "0.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"log 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "mozjs-sys"
@ -490,44 +533,44 @@ dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"hyper 0.0.1 (git+https://github.com/servo/hyper?ref=servo)",
"hyper 0.1.0 (git+https://github.com/servo/hyper?branch=servo)",
"io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"style 0.0.1",
"url 0.2.4 (git+https://github.com/servo/rust-url)",
"url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
[[package]]
name = "mucell"
version = "0.1.2"
source = "git+https://github.com/chris-morgan/mucell#d198c6605b3e688719db168db0939051c803b1ea"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "net"
version = "0.0.1"
dependencies = [
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"hyper 0.0.1 (git+https://github.com/servo/hyper?ref=servo)",
"hyper 0.1.0 (git+https://github.com/servo/hyper?branch=servo)",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
"stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"url 0.2.4 (git+https://github.com/servo/rust-url)",
"time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
[[package]]
name = "openssl"
version = "0.2.4"
source = "git+https://github.com/sfackler/rust-openssl#f299e336d06a85438c3ee90aa06235510f3f5dbe"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"openssl-sys 0.2.4 (git+https://github.com/sfackler/rust-openssl)",
"openssl-sys 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "openssl-sys"
version = "0.2.4"
source = "git+https://github.com/sfackler/rust-openssl#f299e336d06a85438c3ee90aa06235510f3f5dbe"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libressl-pnacl-sys 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -535,21 +578,25 @@ dependencies = [
[[package]]
name = "phf"
version = "0.0.1"
source = "git+https://github.com/sfackler/rust-phf#6a7cc6eb9ec08b103b6b62fa39bdb3229f3cdbe4"
version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"xxhash 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"phf_shared 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "phf_mac"
version = "0.0.1"
source = "git+https://github.com/sfackler/rust-phf#6a7cc6eb9ec08b103b6b62fa39bdb3229f3cdbe4"
version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"time 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"xxhash 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"phf_shared 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "phf_shared"
version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "pkg-config"
version = "0.1.1"
@ -567,29 +614,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "png"
version = "0.1.0"
source = "git+https://github.com/servo/rust-png#cc1976df347bb21ac78c5b37e651b85878855991"
source = "git+https://github.com/servo/rust-png#2804379427ced963466d19132b816bb06a8a4006"
dependencies = [
"gcc 0.1.1 (git+https://github.com/alexcrichton/gcc-rs)",
"gcc 0.1.4 (git+https://github.com/alexcrichton/gcc-rs)",
"png-sys 1.6.16 (git+https://github.com/servo/rust-png)",
]
[[package]]
name = "png-sys"
version = "1.6.16"
source = "git+https://github.com/servo/rust-png#cc1976df347bb21ac78c5b37e651b85878855991"
source = "git+https://github.com/servo/rust-png#2804379427ced963466d19132b816bb06a8a4006"
[[package]]
name = "regex"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "rustc-serialize"
version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "script"
version = "0.0.1"
dependencies = [
"canvas 0.0.1",
"cssparser 0.1.1 (git+https://github.com/servo/rust-cssparser)",
"cssparser 0.2.0 (git+https://github.com/servo/rust-cssparser)",
"devtools_traits 0.0.1",
"encoding 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gfx 0.0.1",
"html5ever 0.0.0 (git+https://github.com/servo/html5ever)",
"hyper 0.0.1 (git+https://github.com/servo/hyper?ref=servo)",
"hyper 0.1.0 (git+https://github.com/servo/hyper?branch=servo)",
"js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
"msg 0.0.1",
"net 0.0.1",
@ -598,10 +655,10 @@ dependencies = [
"string_cache 0.0.0 (git+https://github.com/servo/string-cache)",
"string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache)",
"style 0.0.1",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"url 0.2.4 (git+https://github.com/servo/rust-url)",
"time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
"uuid 0.1.1 (git+https://github.com/rust-lang/uuid)",
"uuid 0.1.7 (git+https://github.com/rust-lang/uuid)",
]
[[package]]
@ -612,7 +669,7 @@ dependencies = [
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"msg 0.0.1",
"net 0.0.1",
"url 0.2.4 (git+https://github.com/servo/rust-url)",
"url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@ -621,21 +678,23 @@ name = "servo"
version = "0.0.1"
dependencies = [
"compositing 0.0.1",
"devtools 0.0.1",
"gfx 0.0.1",
"glutin_app 0.0.1",
"layout 0.0.1",
"msg 0.0.1",
"net 0.0.1",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
"script 0.0.1",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"url 0.2.4 (git+https://github.com/servo/rust-url)",
"time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
[[package]]
name = "skia-sys"
version = "0.0.20130412"
source = "git+https://github.com/servo/skia?ref=upstream-2014-06-16#35649d0cddfd89c0bfee0ff558da7291e26d30c3"
source = "git+https://github.com/servo/skia?branch=upstream-2014-06-16#35649d0cddfd89c0bfee0ff558da7291e26d30c3"
dependencies = [
"expat-sys 2.1.0 (git+https://github.com/servo/libexpat)",
"freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)",
@ -644,42 +703,42 @@ dependencies = [
[[package]]
name = "stb_image"
version = "0.1.0"
source = "git+https://github.com/servo/rust-stb-image#97d7e440e80e41a304647363c322eab68e3700aa"
source = "git+https://github.com/servo/rust-stb-image#2ba03a447b9ef101c25e07bb7f8876416e5fcd71"
[[package]]
name = "string_cache"
version = "0.0.0"
source = "git+https://github.com/servo/string-cache#661c537b85f19ac81dfcd84e28557d480b6b7a9f"
source = "git+https://github.com/servo/string-cache#43a1e5d0d0f2a45e2b96160c8fbe6e1d9602cfa9"
dependencies = [
"lazy_static 0.1.0 (git+https://github.com/Kimundi/lazy-static.rs)",
"phf 0.0.1 (git+https://github.com/sfackler/rust-phf)",
"phf_mac 0.0.1 (git+https://github.com/sfackler/rust-phf)",
"lazy_static 0.1.6 (git+https://github.com/Kimundi/lazy-static.rs)",
"phf 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
"phf_mac 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache)",
"xxhash 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"xxhash 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "string_cache_macros"
version = "0.0.0"
source = "git+https://github.com/servo/string-cache#661c537b85f19ac81dfcd84e28557d480b6b7a9f"
source = "git+https://github.com/servo/string-cache#43a1e5d0d0f2a45e2b96160c8fbe6e1d9602cfa9"
dependencies = [
"lazy_static 0.1.0 (git+https://github.com/Kimundi/lazy-static.rs)",
"lazy_static 0.1.6 (git+https://github.com/Kimundi/lazy-static.rs)",
]
[[package]]
name = "style"
version = "0.0.1"
dependencies = [
"cssparser 0.1.1 (git+https://github.com/servo/rust-cssparser)",
"encoding 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"cssparser 0.2.0 (git+https://github.com/servo/rust-cssparser)",
"encoding 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"lazy_static 0.1.0 (git+https://github.com/Kimundi/lazy-static.rs)",
"matches 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 0.1.6 (git+https://github.com/Kimundi/lazy-static.rs)",
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1",
"string_cache 0.0.0 (git+https://github.com/servo/string-cache)",
"string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache)",
"text_writer 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.4 (git+https://github.com/servo/rust-url)",
"text_writer 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@ -689,59 +748,63 @@ version = "0.0.1"
[[package]]
name = "text_writer"
version = "0.1.4"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "time"
version = "0.1.0"
source = "git+https://github.com/rust-lang/time#afab521f3b91658a3ba2d3e877b7e01699733bef"
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"gcc 0.1.1 (git+https://github.com/alexcrichton/gcc-rs)",
"gcc 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "time"
version = "0.1.3"
name = "unicase"
version = "0.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"gcc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "unsafe-any"
version = "0.1.1"
source = "git+https://github.com/reem/rust-unsafe-any#eb3fe87bea85f375b8fcefa0cdecfd131fae9624"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "url"
version = "0.2.4"
source = "git+https://github.com/servo/rust-url#79f8034a8e1815ffa1f49204572ddbf6eb747c75"
version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "util"
version = "0.0.1"
dependencies = [
"cssparser 0.1.1 (git+https://github.com/servo/rust-cssparser)",
"cssparser 0.2.0 (git+https://github.com/servo/rust-cssparser)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"plugins 0.0.1",
"string_cache 0.0.0 (git+https://github.com/servo/string-cache)",
"string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache)",
"task_info 0.0.1",
"text_writer 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"url 0.2.4 (git+https://github.com/servo/rust-url)",
"text_writer 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "uuid"
version = "0.1.1"
source = "git+https://github.com/rust-lang/uuid#fc793c974a25c126c5cf5daa3b18973512a7a6a0"
version = "0.1.7"
source = "git+https://github.com/rust-lang/uuid#3ea51ffa0682c820e8c8b505de078e3bc93e2cb3"
dependencies = [
"rustc-serialize 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "winapi"
version = "0.0.2"
version = "0.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@ -751,11 +814,11 @@ source = "git+https://github.com/servo/rust-xlib#58ec3847b592aeabdcfeb6a2d02033d
[[package]]
name = "xml-rs"
version = "0.1.3"
source = "git+https://github.com/netvl/xml-rs#1a812d3ba720afd768bd75d29a5b5f10ddcdfbeb"
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "xxhash"
version = "0.0.3"
version = "0.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"

28
ports/cef/browser.rs
View file

@ -20,8 +20,8 @@ use std::borrow::ToOwned;
use std::cell::{Cell, RefCell};
use std::sync::atomic::{AtomicInt, Ordering};
thread_local!(pub static ID_COUNTER: AtomicInt = AtomicInt::new(0))
thread_local!(pub static BROWSERS: RefCell<Vec<CefBrowser>> = RefCell::new(vec!()))
thread_local!(pub static ID_COUNTER: AtomicInt = AtomicInt::new(0));
thread_local!(pub static BROWSERS: RefCell<Vec<CefBrowser>> = RefCell::new(vec!()));
pub enum ServoBrowser {
Invalid,
@ -57,22 +57,22 @@ impl ServoBrowser {
cef_class_impl! {
ServoCefBrowser : CefBrowser, cef_browser_t {
fn get_host(&this) -> *mut cef_browser_host_t {
fn get_host(&this,) -> *mut cef_browser_host_t {{
this.downcast().host.clone()
}
}}
fn go_back(&this) -> () {
fn go_back(&this,) -> () {{
this.send_window_event(WindowEvent::Navigation(WindowNavigateMsg::Back));
}
}}
fn go_forward(&this) -> () {
fn go_forward(&this,) -> () {{
this.send_window_event(WindowEvent::Navigation(WindowNavigateMsg::Forward));
}
}}
// Returns the main (top-level) frame for the browser window.
fn get_main_frame(&this) -> *mut cef_frame_t {
fn get_main_frame(&this,) -> *mut cef_frame_t {{
this.downcast().frame.clone()
}
}}
}
}
@ -225,25 +225,25 @@ cef_static_method_impls! {
_url: *const cef_string_t,
_browser_settings: *const cef_browser_settings_t,
_request_context: *mut cef_request_context_t)
-> c_int {
-> c_int {{
let client: CefClient = client;
let _url: &[u16] = _url;
let _browser_settings: &cef_browser_settings_t = _browser_settings;
let _request_context: CefRequestContext = _request_context;
browser_host_create(window_info, client, false);
1i32
}
}}
fn cef_browser_host_create_browser_sync(window_info: *const cef_window_info_t,
client: *mut cef_client_t,
_url: *const cef_string_t,
_browser_settings: *const cef_browser_settings_t,
_request_context: *mut cef_request_context_t)
-> *mut cef_browser_t {
-> *mut cef_browser_t {{
let client: CefClient = client;
let _url: &[u16] = _url;
let _browser_settings: &cef_browser_settings_t = _browser_settings;
let _request_context: CefRequestContext = _request_context;
browser_host_create(window_info, client, true)
}
}}
}

71
ports/cef/browser_host.rs
View file

@ -22,32 +22,33 @@ pub struct ServoCefBrowserHost {
pub client: CefClient,
}
cef_class_impl! {
full_cef_class_impl! {
ServoCefBrowserHost : CefBrowserHost, cef_browser_host_t {
fn get_client(&this) -> *mut cef_client_t {
fn get_client(&this,) -> *mut cef_client_t {{
this.downcast().client.clone()
}
}}
fn was_resized(&this) -> () {
fn was_resized(&this,) -> () {{
let mut rect = cef_rect_t::zero();
this.get_client()
.get_render_handler()
.get_backing_rect(this.downcast().browser.borrow().clone().unwrap(), &mut rect);
let size = TypedSize2D(rect.width as uint, rect.height as uint);
let size = TypedSize2D(rect.width as u32, rect.height as u32);
this.downcast().send_window_event(WindowEvent::Resize(size));
}
}}
fn close_browser(&this, _force: c_int) -> () {
fn close_browser(&this, _force: c_int [c_int],) -> () {{
browser::close(this.downcast().browser.borrow_mut().take().unwrap());
}
}}
fn send_focus_event(&this, focus: c_int) -> () {
fn send_focus_event(&this, focus: c_int [c_int],) -> () {{
let focus: c_int = focus;
if focus != 0 {
this.downcast().send_window_event(WindowEvent::Refresh);
}
}
}}
fn send_key_event(&this, event: *const cef_key_event) -> () {
fn send_key_event(&this, event: *const cef_key_event [&cef_key_event],) -> () {{
// FIXME(pcwalton): So awful. But it's nearly midnight here and I have to get
// Google working.
let event: &cef_key_event = event;
@ -98,15 +99,17 @@ cef_class_impl! {
};
let key_modifiers = KeyModifiers::empty(); // TODO(pcwalton)
this.downcast().send_window_event(WindowEvent::KeyEvent(key, key_state, key_modifiers))
}
}}
fn send_mouse_click_event(&this,
event: *const cef_mouse_event,
mouse_button_type: cef_mouse_button_type_t,
mouse_up: c_int,
_click_count: c_int)
-> () {
event: *const cef_mouse_event [&cef_mouse_event],
mouse_button_type: cef_mouse_button_type_t [cef_mouse_button_type_t],
mouse_up: c_int [c_int],
_click_count: c_int [c_int],)
-> () {{
let event: &cef_mouse_event = event;
let mouse_button_type: cef_mouse_button_type_t = mouse_button_type;
let mouse_up: c_int = mouse_up;
let button_type = mouse_button_type as uint;
let point = TypedPoint2D((*event).x as f32, (*event).y as f32);
if mouse_up != 0 {
@ -116,38 +119,42 @@ cef_class_impl! {
this.downcast().send_window_event(WindowEvent::MouseWindowEventClass(
MouseWindowEvent::MouseUp(button_type, point)))
}
}
}}
fn send_mouse_move_event(&this, event: *const cef_mouse_event, _mouse_exited: c_int)
-> () {
fn send_mouse_move_event(&this, event: *const cef_mouse_event [&cef_mouse_event],
_mouse_exited: c_int [c_int],)
-> () {{
let event: &cef_mouse_event = event;
let point = TypedPoint2D((*event).x as f32, (*event).y as f32);
this.downcast().send_window_event(WindowEvent::MouseWindowMoveEventClass(point))
}
}}
fn send_mouse_wheel_event(&this,
event: *const cef_mouse_event,
delta_x: c_int,
delta_y: c_int)
-> () {
event: *const cef_mouse_event [&cef_mouse_event],
delta_x: c_int [c_int],
delta_y: c_int [c_int],)
-> () {{
let event: &cef_mouse_event = event;
let delta_x: c_int = delta_x;
let delta_y: c_int = delta_y;
let delta = TypedPoint2D(delta_x as f32, delta_y as f32);
let origin = TypedPoint2D((*event).x as i32, (*event).y as i32);
this.downcast().send_window_event(WindowEvent::Scroll(delta, origin))
}
}}
fn get_zoom_level(&this) -> c_double {
fn get_zoom_level(&this,) -> c_double {{
this.downcast().pinch_zoom_level() as c_double
}
}}
fn set_zoom_level(&this, new_zoom_level: c_double) -> () {
fn set_zoom_level(&this, new_zoom_level: c_double [c_double],) -> () {{
let new_zoom_level: c_double = new_zoom_level;
let old_zoom_level = this.get_zoom_level();
this.downcast().send_window_event(WindowEvent::PinchZoom((new_zoom_level / old_zoom_level) as f32))
}
}}
fn initialize_compositing(&this) -> () {
fn initialize_compositing(&this,) -> () {{
this.downcast().send_window_event(WindowEvent::InitializeCompositing);
}
}}
}
}

37
ports/cef/command_line.rs
View file

@ -4,10 +4,11 @@
use interfaces::cef_command_line_t;
use libc::{calloc, c_int, size_t};
use libc::{calloc, c_int, c_char, size_t};
use std::ffi;
use std::mem;
use std::string;
use std::c_vec::CVec;
use std::slice;
use std::str;
use string as cef_string;
use string::cef_string_utf16_set;
use types::{cef_string_t, cef_string_userfree_t, cef_string_utf16_t};
@ -33,12 +34,15 @@ pub fn command_line_init(argc: c_int, argv: *const *const u8) {
unsafe {
let mut a: Vec<String> = vec!();
for i in range(0u, argc as uint) {
a.push(string::raw::from_buf(*argv.offset(i as int) as *const u8));
let offset = *argv.offset(i as int) as *const c_char;
let slice = ffi::c_str_to_bytes(&offset);
let s = str::from_utf8(slice).unwrap();
a.push(String::from_str(s));
}
let cl = command_line_new();
(*cl).argc = argc;
(*cl).argv = a;
(*cl).cl.get_switch_value = Some(command_line_get_switch_value);
(*cl).cl.get_switch_value = Some(command_line_get_switch_value as extern "C" fn(*mut cef_command_line_t, *const cef_string_t) -> cef_string_userfree_t);
GLOBAL_CMDLINE = Some(cl);
}
}
@ -53,20 +57,21 @@ pub extern "C" fn command_line_get_switch_value(cmd: *mut cef_command_line_t, na
//but the default cef callback uses utf16, so I'm jumping on board the SS Copy
let cl: *mut command_line_t = mem::transmute(cmd);
let cs: *const cef_string_utf16_t = mem::transmute(name);
let opt = String::from_utf16(CVec::new((*cs).str, (*cs).length as uint).as_slice()).unwrap();
let buf = (*cs).str as *const _;
let slice = slice::from_raw_buf(&buf, (*cs).length as usize);
let opt = String::from_utf16(slice).unwrap();
//debug!("opt: {}", opt);
for s in (*cl).argv.iter() {
let o = s.as_slice().trim_left_chars('-');
let o = s.as_slice().trim_left_matches('-');
//debug!("arg: {}", o);
if o.as_slice().starts_with(opt.as_slice()) {
let mut string = mem::uninitialized();
let arg = o.slice_from(opt.len() + 1).as_bytes();
arg.with_c_str(|c_str| {
cef_string_utf16_set(mem::transmute(c_str),
arg.len() as size_t,
&mut string,
1);
});
let c_str = ffi::CString::from_slice(arg);
cef_string_utf16_set(c_str.as_bytes().as_ptr() as *const _,
arg.len() as size_t,
&mut string,
1);
return cef_string::string_to_userfree_string(string)
}
}
@ -78,7 +83,7 @@ pub extern "C" fn command_line_get_switch_value(cmd: *mut cef_command_line_t, na
pub extern "C" fn cef_command_line_create() -> *mut cef_command_line_t {
unsafe {
let cl = command_line_new();
(*cl).cl.get_switch_value = Some(command_line_get_switch_value);
(*cl).cl.get_switch_value = Some(command_line_get_switch_value as extern "C" fn(*mut cef_command_line_t, *const cef_string_t) -> cef_string_userfree_t);
mem::transmute(cl)
}
}
@ -98,7 +103,7 @@ pub extern "C" fn cef_command_line_get_global() -> *mut cef_command_line_t {
}
cef_stub_static_method_impls! {
fn cef_command_line_create_command_line() -> *mut cef_command_line_t;
fn cef_command_line_get_global_command_line() -> *mut cef_command_line_t;
fn cef_command_line_create_command_line() -> *mut cef_command_line_t
fn cef_command_line_get_global_command_line() -> *mut cef_command_line_t
}

4
ports/cef/cookie.rs
View file

@ -8,9 +8,9 @@ use types::cef_string_t;
use libc::c_int;
cef_stub_static_method_impls! {
fn cef_cookie_manager_get_global_manager() -> *mut cef_cookie_manager_t;
fn cef_cookie_manager_get_global_manager() -> *mut cef_cookie_manager_t
fn cef_cookie_manager_create_manager(path: *const cef_string_t,
persist_session_cookies: c_int)
-> *mut cef_cookie_manager_t;
-> *mut cef_cookie_manager_t
}

17
ports/cef/core.rs
View file

@ -8,12 +8,10 @@ use types::{cef_main_args_t, cef_settings_t};
use geom::size::TypedSize2D;
use libc::{c_char, c_int, c_void};
use rustrt::local::Local;
use rustrt::task;
use servo_util::opts;
use std::borrow::ToOwned;
use std::c_str::CString;
use std::rt;
use std::ffi;
use std::str;
use browser;
const MAX_RENDERING_THREADS: uint = 128;
@ -39,11 +37,6 @@ fn resources_path() -> Option<String> {
None
}
fn create_rust_task() {
let task = box task::Task::new(None, None);
Local::put(task);
}
#[no_mangle]
pub extern "C" fn cef_initialize(args: *const cef_main_args_t,
settings: *mut cef_settings_t,
@ -55,7 +48,6 @@ pub extern "C" fn cef_initialize(args: *const cef_main_args_t,
}
unsafe {
rt::init((*args).argc as int, (*args).argv);
command_line_init((*args).argc, (*args).argv);
if !application.is_null() {
@ -68,8 +60,6 @@ pub extern "C" fn cef_initialize(args: *const cef_main_args_t,
}
}
create_rust_task();
let urls = vec![HOME_URL.to_owned()];
opts::set_opts(opts::Opts {
urls: urls,
@ -156,7 +146,8 @@ pub extern "C" fn cef_log(_file: *const c_char,
_severity: c_int,
message: *const c_char) {
unsafe {
println!("{}", CString::new(message, false))
let slice = ffi::c_str_to_bytes(&message);
println!("{}", str::from_utf8(slice).unwrap())
}
}

2
ports/cef/drag_data.rs
View file

@ -5,6 +5,6 @@
use interfaces::{cef_drag_data_t};
cef_stub_static_method_impls! {
fn cef_drag_data_create() -> *mut cef_drag_data_t;
fn cef_drag_data_create() -> *mut cef_drag_data_t
}

11
ports/cef/eutil.rs
View file

@ -19,11 +19,10 @@ pub trait Downcast<Class> {
fn downcast(&self) -> &Class;
}
pub fn slice_to_str(s: *const u8, l: uint, f: |&str| -> c_int) -> c_int {
pub fn slice_to_str<F>(s: *const u8, l: uint, f: F) -> c_int where F: FnOnce(&str) -> c_int {
unsafe {
slice::raw::buf_as_slice(s, l, |result| {
str::from_utf8(result).map(|s| f(s)).unwrap_or(0)
})
let s = slice::from_raw_buf(&s, l);
str::from_utf8(s).map(f).unwrap_or(0)
}
}
@ -34,8 +33,8 @@ pub unsafe fn create_cef_object<Base,Extra>(size: size_t) -> *mut Base {
let object = libc::calloc(1, (mem::size_of::<Base>() + mem::size_of::<Extra>()) as u64) as
*mut cef_base_t;
(*object).size = size;
(*object).add_ref = Some(servo_add_ref);
(*object).release = Some(servo_release);
(*object).add_ref = Some(servo_add_ref as extern "C" fn(*mut cef_base_t) -> c_int);
(*object).release = Some(servo_release as extern "C" fn(*mut cef_base_t) -> c_int);
*ref_count(object) = 1;
object as *mut Base
}

21
ports/cef/frame.rs
View file

@ -28,23 +28,24 @@ impl ServoCefFrame {
}
}
cef_class_impl! {
full_cef_class_impl! {
ServoCefFrame : CefFrame, cef_frame_t {
fn load_url(&this, url: *const cef_string_t) -> () {
fn load_url(&this, url: *const cef_string_t [&[u16]],) -> () {{
let this = this.downcast();
*this.url.borrow_mut() = String::from_utf16(url).unwrap();
let event = WindowEvent::LoadUrl(String::from_utf16(url).unwrap());
let url = String::from_utf16(url).unwrap();
*this.url.borrow_mut() = url.clone();
let event = WindowEvent::LoadUrl(url);
this.browser.borrow_mut().as_mut().unwrap().send_window_event(event);
}
fn get_url(&this) -> cef_string_userfree_t {
}}
fn get_url(&this,) -> cef_string_userfree_t {{
let this = this.downcast();
(*this.url.borrow()).clone()
}
fn get_text(&this, visitor: *mut cef_string_visitor_t) -> () {
}}
fn get_text(&this, visitor: *mut cef_string_visitor_t [CefStringVisitor],) -> () {{
let this = this.downcast();
*this.title_visitor.borrow_mut() = Some(visitor);
this.browser.borrow().as_ref().unwrap().get_title_for_main_frame();
}
}}
}
}
@ -56,4 +57,4 @@ impl ServoCefFrameExtensions for CefFrame {
fn set_browser(&self, browser: CefBrowser) {
*self.downcast().browser.borrow_mut() = Some(browser)
}
}
}

10
ports/cef/lib.rs
View file

@ -2,15 +2,14 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#![feature(globs, macro_rules, phase, thread_local, link_args)]
#![feature(thread_local, link_args, plugin, box_syntax, int_uint)]
#![allow(experimental, non_camel_case_types)]
#![allow(experimental, non_camel_case_types, unstable)]
#![deny(unused_imports, unused_variables, unused_mut)]
#![feature(phase)]
#[phase(plugin, link)]
#[macro_use]
extern crate log;
#[phase(plugin)]
#[plugin]
extern crate "plugins" as servo_plugins;
extern crate servo;
@ -32,7 +31,6 @@ extern crate "util" as servo_util;
extern crate style;
extern crate stb_image;
extern crate rustrt;
extern crate libc;
extern crate "url" as std_url;

42
ports/cef/macros.rs
View file

@ -35,9 +35,29 @@
macro_rules! cef_class_impl(
($class_name:ident : $interface_name:ident, $c_interface_name:ident {
$(
fn $method_name:ident ( & $method_this:ident
$( , $method_arg_name:ident : $method_arg_type:ty )* )
-> $method_return_type:ty $method_body:block
fn $method_name:ident ( & $method_this:ident ,
$( $method_arg_name:ident : $c_method_arg_type:ty ,)* )
-> $method_return_type:ty {$method_body:block}
)*
}) => (
full_cef_class_impl! {
$class_name : $interface_name, $c_interface_name {
$(fn $method_name(&$method_this,
$($method_arg_name : $c_method_arg_type [$c_method_arg_type],)*)
-> $method_return_type {
$method_body
})*
}
}
)
);
macro_rules! full_cef_class_impl(
($class_name:ident : $interface_name:ident, $c_interface_name:ident {
$(
fn $method_name:ident ( & $method_this:ident ,
$( $method_arg_name:ident : $c_method_arg_type:ty [$method_arg_type:ty] ,)* )
-> $method_return_type:ty {$method_body:block}
)*
}) => (
impl $class_name {
@ -52,7 +72,7 @@ macro_rules! cef_class_impl(
::eutil::create_cef_object::<$c_interface_name,$class_name>(size))
};
unsafe {
$((*cef_object.c_object()).$method_name = Some($method_name);)*
$((*cef_object.c_object()).$method_name = Some($method_name as extern "C" fn(*mut $c_interface_name, $($c_method_arg_type,)*) -> $method_return_type);)*
let extra_slot =
::std::mem::transmute::<&mut u8,
&mut $class_name>(&mut (*cef_object.c_object())
@ -65,13 +85,13 @@ macro_rules! cef_class_impl(
$(
extern "C" fn $method_name(raw_this: *mut $c_interface_name,
$($method_arg_name: $method_arg_type),*)
$($method_arg_name: $c_method_arg_type),*)
-> $method_return_type {
let $method_this = unsafe {
$interface_name::from_c_object_addref(raw_this)
};
$(
let $method_arg_name = unsafe {
let $method_arg_name: $method_arg_type = unsafe {
::wrappers::CefWrap::to_rust($method_arg_name)
};
)*
@ -87,13 +107,13 @@ macro_rules! cef_class_impl(
}
}
)
)
);
macro_rules! cef_static_method_impls(
(
$(
fn $method_name:ident ( $($method_arg_name:ident : $method_arg_type:ty ),* )
-> $method_return_type:ty $method_body:block
-> $method_return_type:ty {$method_body:block}
)*
) => (
$(
@ -109,13 +129,13 @@ macro_rules! cef_static_method_impls(
}
)*
)
)
);
macro_rules! cef_stub_static_method_impls(
(
$(
fn $method_name:ident ( $($method_arg_name:ident : $method_arg_type:ty ),* )
-> $method_return_type:ty ;
-> $method_return_type:ty
)*
) => (
$(
@ -126,4 +146,4 @@ macro_rules! cef_stub_static_method_impls(
}
)*
)
)
);

2
ports/cef/print_settings.rs
View file

@ -5,5 +5,5 @@
use interfaces::cef_print_settings_t;
cef_stub_static_method_impls! {
fn cef_print_settings_create() -> *mut cef_print_settings_t;
fn cef_print_settings_create() -> *mut cef_print_settings_t
}

2
ports/cef/process_message.rs
View file

@ -6,6 +6,6 @@ use interfaces::cef_process_message_t;
use types::cef_string_t;
cef_stub_static_method_impls! {
fn cef_process_message_create(name: *const cef_string_t) -> *mut cef_process_message_t;
fn cef_process_message_create(name: *const cef_string_t) -> *mut cef_process_message_t
}

6
ports/cef/request.rs
View file

@ -5,8 +5,8 @@
use interfaces::{cef_post_data_element_t, cef_post_data_t, cef_request_t};
cef_stub_static_method_impls! {
fn cef_request_create() -> *mut cef_request_t;
fn cef_post_data_create() -> *mut cef_post_data_t;
fn cef_post_data_element_create() -> *mut cef_post_data_element_t;
fn cef_request_create() -> *mut cef_request_t
fn cef_post_data_create() -> *mut cef_post_data_t
fn cef_post_data_element_create() -> *mut cef_post_data_element_t
}

4
ports/cef/request_context.rs
View file

@ -5,8 +5,8 @@
use interfaces::{cef_request_context_handler_t, cef_request_context_t};
cef_stub_static_method_impls! {
fn cef_request_context_get_global_context() -> *mut cef_request_context_t;
fn cef_request_context_get_global_context() -> *mut cef_request_context_t
fn cef_request_context_create_context(_handler: *mut cef_request_context_handler_t)
-> *mut cef_request_context_t;
-> *mut cef_request_context_t
}

2
ports/cef/response.rs
View file

@ -5,6 +5,6 @@
use interfaces::cef_response_t;
cef_stub_static_method_impls! {
fn cef_response_create() -> *mut cef_response_t;
fn cef_response_create() -> *mut cef_response_t
}

10
ports/cef/stream.rs
View file

@ -10,14 +10,14 @@ use libc;
cef_stub_static_method_impls! {
fn cef_stream_reader_create_for_file(_file_name: *const cef_string_t)
-> *mut cef_stream_reader_t;
-> *mut cef_stream_reader_t
fn cef_stream_reader_create_for_data(_data: *mut (), _size: libc::size_t)
-> *mut cef_stream_reader_t;
-> *mut cef_stream_reader_t
fn cef_stream_reader_create_for_handler(_handler: *mut cef_read_handler_t)
-> *mut cef_stream_reader_t;
-> *mut cef_stream_reader_t
fn cef_stream_writer_create_for_file(_file_name: *const cef_string_t)
-> *mut cef_stream_writer_t;
-> *mut cef_stream_writer_t
fn cef_stream_writer_create_for_handler(_handler: *mut cef_write_handler_t)
-> *mut cef_stream_writer_t;
-> *mut cef_stream_writer_t
}

91
ports/cef/string.rs
View file

@ -93,7 +93,7 @@ pub extern "C" fn cef_string_utf8_set(src: *const u8, src_len: size_t, output: *
ptr::copy_memory((*output).str, src, src_len as uint);
(*output).length = src_len;
(*output).dtor = Some(string_utf8_dtor);
(*output).dtor = Some(string_utf8_dtor as extern "C" fn(*mut u8));
}
} else {
(*output).str = mem::transmute(src);
@ -107,15 +107,15 @@ pub extern "C" fn cef_string_utf8_set(src: *const u8, src_len: size_t, output: *
#[no_mangle]
pub extern "C" fn cef_string_utf8_cmp(a: *const cef_string_utf8_t, b: *const cef_string_utf8_t) -> c_int {
unsafe {
slice::raw::buf_as_slice((*a).str as *const u8, (*a).length as uint, |astr:&[u8]| {
slice::raw::buf_as_slice((*b).str as *const u8, (*b).length as uint, |bstr:&[u8]| {
match astr.cmp(bstr) {
Ordering::Less => -1,
Ordering::Equal => 0,
Ordering::Greater => 1
}
})
})
let astr = (*a).str as *const u8;
let bstr = (*b).str as *const u8;
let astr = slice::from_raw_buf(&astr, (*a).length as uint);
let bstr = slice::from_raw_buf(&bstr, (*b).length as uint);
match astr.cmp(bstr) {
Ordering::Less => -1,
Ordering::Equal => 0,
Ordering::Greater => 1
}
}
}
@ -131,15 +131,14 @@ pub extern "C" fn cef_string_utf8_to_utf16(src: *const u8, src_len: size_t, outp
#[no_mangle]
pub extern "C" fn cef_string_utf16_to_utf8(src: *const u16, src_len: size_t, output: *mut cef_string_utf8_t) -> c_int {
unsafe {
slice::raw::buf_as_slice(src, src_len as uint, |ustr| {
match string::String::from_utf16(ustr) {
Some(str) => {
cef_string_utf8_set(str.as_bytes().as_ptr(), str.len() as size_t, output, 1);
1 as c_int
},
None => 0 as c_int
}
})
let ustr = slice::from_raw_buf(&src, src_len as uint);
match string::String::from_utf16(ustr) {
Ok(str) => {
cef_string_utf8_set(str.as_bytes().as_ptr(), str.len() as size_t, output, 1);
1 as c_int
},
_ => 0 as c_int
}
}
}
@ -175,7 +174,7 @@ pub extern "C" fn cef_string_utf16_set(src: *const c_ushort, src_len: size_t, ou
ptr::copy_memory((*output).str, src, src_len as uint);
(*output).length = src_len;
(*output).dtor = Some(string_utf16_dtor);
(*output).dtor = Some(string_utf16_dtor as extern "C" fn(*mut c_ushort));
}
} else {
(*output).str = mem::transmute(src);
@ -189,15 +188,15 @@ pub extern "C" fn cef_string_utf16_set(src: *const c_ushort, src_len: size_t, ou
#[no_mangle]
pub extern "C" fn cef_string_utf16_cmp(a: *const cef_string_utf16_t, b: *const cef_string_utf16_t) -> c_int {
unsafe {
slice::raw::buf_as_slice(mem::transmute((*a).str), (*a).length as uint, |astr:&[u16]| {
slice::raw::buf_as_slice(mem::transmute((*b).str), (*b).length as uint, |bstr:&[u16]| {
match astr.cmp(bstr) {
Ordering::Less => -1,
Ordering::Equal => 0,
Ordering::Greater => 1
}
})
})
let astr = (*a).str as *const _;
let bstr = (*b).str as *const _;
let astr: &[u16] = slice::from_raw_buf(&astr, (*a).length as uint);
let bstr: &[u16] = slice::from_raw_buf(&bstr, (*b).length as uint);
match astr.cmp(bstr) {
Ordering::Less => -1,
Ordering::Equal => 0,
Ordering::Greater => 1
}
}
}
@ -233,7 +232,7 @@ pub extern "C" fn cef_string_wide_set(src: *const wchar_t, src_len: size_t, outp
ptr::copy_memory((*output).str, src, src_len as uint);
(*output).length = src_len;
(*output).dtor = Some(string_wide_dtor);
(*output).dtor = Some(string_wide_dtor as extern "C" fn(*mut wchar_t));
}
} else {
(*output).str = mem::transmute(src);
@ -247,15 +246,15 @@ pub extern "C" fn cef_string_wide_set(src: *const wchar_t, src_len: size_t, outp
#[no_mangle]
pub extern "C" fn cef_string_wide_cmp(a: *const cef_string_wide_t, b: *const cef_string_wide_t) -> c_int {
unsafe {
slice::raw::buf_as_slice((*a).str as *const wchar_t, (*a).length as uint, |astr:&[wchar_t]| {
slice::raw::buf_as_slice((*b).str as *const wchar_t, (*b).length as uint, |bstr:&[wchar_t]| {
match astr.cmp(bstr) {
Ordering::Less => -1,
Ordering::Equal => 0,
Ordering::Greater => 1
}
})
})
let astr = (*a).str as *const wchar_t;
let bstr = (*b).str as *const wchar_t;
let astr = slice::from_raw_buf(&astr, (*a).length as uint);
let bstr = slice::from_raw_buf(&bstr, (*b).length as uint);
match astr.cmp(bstr) {
Ordering::Less => -1,
Ordering::Equal => 0,
Ordering::Greater => 1
}
}
}
@ -276,10 +275,9 @@ pub extern "C" fn cef_string_wide_to_utf8(src: *const wchar_t, src_len: size_t,
return cef_string_utf16_to_utf8(src as *const u16, src_len, output);
}
unsafe {
slice::raw::buf_as_slice(src, src_len as uint, |ustr| {
let conv = ustr.iter().map(|&c| char::from_u32(c as u32).unwrap_or('\u{FFFD}')).collect::<String>();
cef_string_utf8_set(conv.as_bytes().as_ptr(), conv.len() as size_t, output, 1)
})
let ustr = slice::from_raw_buf(&src, src_len as uint);
let conv = ustr.iter().map(|&c| char::from_u32(c as u32).unwrap_or('\u{FFFD}')).collect::<String>();
cef_string_utf8_set(conv.as_bytes().as_ptr(), conv.len() as size_t, output, 1)
}
}
@ -294,10 +292,9 @@ pub extern "C" fn cef_string_ascii_to_utf16(src: *const u8, src_len: size_t, out
#[no_mangle]
pub extern "C" fn cef_string_ascii_to_wide(src: *const u8, src_len: size_t, output: *mut cef_string_wide_t) -> c_int {
unsafe {
slice::raw::buf_as_slice(src, src_len as uint, |ustr| {
let conv = ustr.iter().map(|&c| c as u8).collect::<Vec<u8>>();
cef_string_wide_set(conv.as_ptr() as *const wchar_t, conv.len() as size_t, output, 1)
})
let ustr = slice::from_raw_buf(&src, src_len as uint);
let conv = ustr.iter().map(|&c| c as u8).collect::<Vec<u8>>();
cef_string_wide_set(conv.as_ptr() as *const wchar_t, conv.len() as size_t, output, 1)
}
}

10
ports/cef/string_map.rs
View file

@ -4,15 +4,15 @@
use eutil::slice_to_str;
use libc::{c_int};
use std::collections::TreeMap;
use std::collections::BTreeMap;
use std::mem;
use std::string::String;
use string::{cef_string_userfree_utf16_alloc, cef_string_userfree_utf16_free};
use string::{cef_string_utf16_set};
use types::{cef_string_map_t, cef_string_t};
fn string_map_to_treemap(sm: *mut cef_string_map_t) -> *mut TreeMap<String, *mut cef_string_t> {
sm as *mut TreeMap<String, *mut cef_string_t>
fn string_map_to_treemap(sm: *mut cef_string_map_t) -> *mut BTreeMap<String, *mut cef_string_t> {
sm as *mut BTreeMap<String, *mut cef_string_t>
}
//cef_string_map
@ -20,7 +20,7 @@ fn string_map_to_treemap(sm: *mut cef_string_map_t) -> *mut TreeMap<String, *mut
#[no_mangle]
pub extern "C" fn cef_string_map_alloc() -> *mut cef_string_map_t {
unsafe {
let sm: Box<TreeMap<String, *mut cef_string_t>> = box TreeMap::new();
let sm: Box<BTreeMap<String, *mut cef_string_t>> = box BTreeMap::new();
mem::transmute(sm)
}
}
@ -119,7 +119,7 @@ pub extern "C" fn cef_string_map_clear(sm: *mut cef_string_map_t) {
pub extern "C" fn cef_string_map_free(sm: *mut cef_string_map_t) {
unsafe {
if sm.is_null() { return; }
let _v: Box<TreeMap<String, *mut cef_string_t>> = mem::transmute(sm);
let _v: Box<BTreeMap<String, *mut cef_string_t>> = mem::transmute(sm);
cef_string_map_clear(sm);
}
}

10
ports/cef/string_multimap.rs
View file

@ -4,7 +4,7 @@
use eutil::slice_to_str;
use libc::{c_int};
use std::collections::TreeMap;
use std::collections::BTreeMap;
use std::iter::AdditiveIterator;
use std::mem;
use std::string::String;
@ -12,8 +12,8 @@ use string::{cef_string_userfree_utf16_alloc, cef_string_userfree_utf16_free};
use string::{cef_string_utf16_set};
use types::{cef_string_multimap_t,cef_string_t};
fn string_multimap_to_treemap(smm: *mut cef_string_multimap_t) -> *mut TreeMap<String, Vec<*mut cef_string_t>> {
smm as *mut TreeMap<String, Vec<*mut cef_string_t>>
fn string_multimap_to_treemap(smm: *mut cef_string_multimap_t) -> *mut BTreeMap<String, Vec<*mut cef_string_t>> {
smm as *mut BTreeMap<String, Vec<*mut cef_string_t>>
}
//cef_string_multimap
@ -21,7 +21,7 @@ fn string_multimap_to_treemap(smm: *mut cef_string_multimap_t) -> *mut TreeMap<S
#[no_mangle]
pub extern "C" fn cef_string_multimap_alloc() -> *mut cef_string_multimap_t {
unsafe {
let smm: Box<TreeMap<String, Vec<*mut cef_string_t>>> = box TreeMap::new();
let smm: Box<BTreeMap<String, Vec<*mut cef_string_t>>> = box BTreeMap::new();
mem::transmute(smm)
}
}
@ -147,7 +147,7 @@ pub extern "C" fn cef_string_multimap_clear(smm: *mut cef_string_multimap_t) {
pub extern "C" fn cef_string_multimap_free(smm: *mut cef_string_multimap_t) {
unsafe {
if smm.is_null() { return; }
let v: Box<TreeMap<String, Vec<*mut cef_string_t>>> = mem::transmute(smm);
let v: Box<BTreeMap<String, Vec<*mut cef_string_t>>> = mem::transmute(smm);
cef_string_multimap_clear(smm);
drop(v);
}

66
ports/cef/stubs.rs
View file

@ -16,38 +16,38 @@ macro_rules! stub(
}
}
)
)
);
stub!(cef_add_cross_origin_whitelist_entry)
stub!(cef_add_web_plugin_directory)
stub!(cef_add_web_plugin_path)
stub!(cef_begin_tracing)
stub!(cef_clear_cross_origin_whitelist)
stub!(cef_clear_scheme_handler_factories)
stub!(cef_create_url)
stub!(cef_end_tracing)
stub!(cef_force_web_plugin_shutdown)
stub!(cef_get_current_platform_thread_handle)
stub!(cef_get_current_platform_thread_id)
stub!(cef_get_extensions_for_mime_type)
stub!(cef_get_geolocation)
stub!(cef_get_mime_type)
stub!(cef_get_path)
stub!(cef_is_web_plugin_unstable)
stub!(cef_launch_process)
stub!(cef_now_from_system_trace_time)
stub!(cef_parse_url)
stub!(cef_post_delayed_task)
stub!(cef_post_task)
stub!(cef_refresh_web_plugins)
stub!(cef_register_extension)
stub!(cef_register_scheme_handler_factory)
stub!(cef_register_web_plugin_crash)
stub!(cef_remove_cross_origin_whitelist_entry)
stub!(cef_remove_web_plugin_path)
stub!(cef_set_osmodal_loop)
stub!(cef_string_utf16_to_wide)
stub!(cef_string_wide_to_utf16)
stub!(cef_unregister_internal_web_plugin)
stub!(cef_visit_web_plugin_info)
stub!(cef_add_cross_origin_whitelist_entry);
stub!(cef_add_web_plugin_directory);
stub!(cef_add_web_plugin_path);
stub!(cef_begin_tracing);
stub!(cef_clear_cross_origin_whitelist);
stub!(cef_clear_scheme_handler_factories);
stub!(cef_create_url);
stub!(cef_end_tracing);
stub!(cef_force_web_plugin_shutdown);
stub!(cef_get_current_platform_thread_handle);
stub!(cef_get_current_platform_thread_id);
stub!(cef_get_extensions_for_mime_type);
stub!(cef_get_geolocation);
stub!(cef_get_mime_type);
stub!(cef_get_path);
stub!(cef_is_web_plugin_unstable);
stub!(cef_launch_process);
stub!(cef_now_from_system_trace_time);
stub!(cef_parse_url);
stub!(cef_post_delayed_task);
stub!(cef_post_task);
stub!(cef_refresh_web_plugins);
stub!(cef_register_extension);
stub!(cef_register_scheme_handler_factory);
stub!(cef_register_web_plugin_crash);
stub!(cef_remove_cross_origin_whitelist_entry);
stub!(cef_remove_web_plugin_path);
stub!(cef_set_osmodal_loop);
stub!(cef_string_utf16_to_wide);
stub!(cef_string_wide_to_utf16);
stub!(cef_unregister_internal_web_plugin);
stub!(cef_visit_web_plugin_info);

4
ports/cef/task.rs
View file

@ -14,7 +14,7 @@ pub extern "C" fn cef_currently_on(_tid: cef_thread_id_t) -> c_int {
}
cef_stub_static_method_impls! {
fn cef_task_runner_get_for_current_thread() -> *mut cef_task_runner_t;
fn cef_task_runner_get_for_thread(thread_id: cef_thread_id_t) -> *mut cef_task_runner_t;
fn cef_task_runner_get_for_current_thread() -> *mut cef_task_runner_t
fn cef_task_runner_get_for_thread(thread_id: cef_thread_id_t) -> *mut cef_task_runner_t
}

30
ports/cef/v8.rs
View file

@ -9,21 +9,21 @@ use types::{cef_string_t, cef_time_t};
use libc::{mod, c_double, c_int};
cef_stub_static_method_impls! {
fn cef_v8context_get_current_context() -> *mut cef_v8context_t;
fn cef_v8context_get_entered_context() -> *mut cef_v8context_t;
fn cef_v8context_in_context() -> libc::c_int;
fn cef_v8value_create_undefined() -> *mut cef_v8value_t;
fn cef_v8value_create_null() -> *mut cef_v8value_t;
fn cef_v8value_create_bool(_value: c_int) -> *mut cef_v8value_t;
fn cef_v8value_create_int(_value: i32) -> *mut cef_v8value_t;
fn cef_v8value_create_uint(_value: u32) -> *mut cef_v8value_t;
fn cef_v8value_create_double(_value: c_double) -> *mut cef_v8value_t;
fn cef_v8value_create_date(_date: *const cef_time_t) -> *mut cef_v8value_t;
fn cef_v8value_create_string(_value: *const cef_string_t) -> *mut cef_v8value_t;
fn cef_v8value_create_object(_accessor: *mut cef_v8accessor_t) -> *mut cef_v8value_t;
fn cef_v8value_create_array(_length: libc::c_int) -> *mut cef_v8value_t;
fn cef_v8context_get_current_context() -> *mut cef_v8context_t
fn cef_v8context_get_entered_context() -> *mut cef_v8context_t
fn cef_v8context_in_context() -> libc::c_int
fn cef_v8value_create_undefined() -> *mut cef_v8value_t
fn cef_v8value_create_null() -> *mut cef_v8value_t
fn cef_v8value_create_bool(_value: c_int) -> *mut cef_v8value_t
fn cef_v8value_create_int(_value: i32) -> *mut cef_v8value_t
fn cef_v8value_create_uint(_value: u32) -> *mut cef_v8value_t
fn cef_v8value_create_double(_value: c_double) -> *mut cef_v8value_t
fn cef_v8value_create_date(_date: *const cef_time_t) -> *mut cef_v8value_t
fn cef_v8value_create_string(_value: *const cef_string_t) -> *mut cef_v8value_t
fn cef_v8value_create_object(_accessor: *mut cef_v8accessor_t) -> *mut cef_v8value_t
fn cef_v8value_create_array(_length: libc::c_int) -> *mut cef_v8value_t
fn cef_v8value_create_function(_name: *const cef_string_t, _handler: *mut cef_v8handler_t)
-> *mut cef_v8value_t;
fn cef_v8stack_trace_get_current(_frame_limit: libc::c_int) -> *mut cef_v8stack_trace_t;
-> *mut cef_v8value_t
fn cef_v8stack_trace_get_current(_frame_limit: libc::c_int) -> *mut cef_v8stack_trace_t
}

6
ports/cef/values.rs
View file

@ -7,8 +7,8 @@ use interfaces::{cef_binary_value_t, cef_dictionary_value_t, cef_list_value_t};
use libc;
cef_stub_static_method_impls! {
fn cef_binary_value_create(_data: *const (), _size: libc::size_t) -> *mut cef_binary_value_t;
fn cef_dictionary_value_create() -> *mut cef_dictionary_value_t;
fn cef_list_value_create() -> *mut cef_list_value_t;
fn cef_binary_value_create(_data: *const (), _size: libc::size_t) -> *mut cef_binary_value_t
fn cef_dictionary_value_create() -> *mut cef_dictionary_value_t
fn cef_list_value_create() -> *mut cef_list_value_t
}

16
ports/cef/window.rs
View file

@ -27,13 +27,15 @@ use servo_msg::constellation_msg::LoadData;
use servo_util::cursor::Cursor;
use servo_util::geometry::ScreenPx;
use std::cell::RefCell;
use std::ffi::CString;
use std::rc::Rc;
use std::sync::mpsc::{Sender, channel};
#[cfg(target_os="macos")]
use std::ptr;
/// The type of an off-screen window.
#[deriving(Clone)]
#[derive(Clone)]
pub struct Window {
cef_browser: RefCell<Option<CefBrowser>>,
}
@ -48,7 +50,7 @@ fn load_gl() {
gl::load_with(|s| {
unsafe {
let c_str = s.to_c_str();
let c_str = CString::from_slice(s.as_bytes());
dlsym(RTLD_DEFAULT, c_str.as_ptr()) as *const c_void
}
});
@ -62,7 +64,7 @@ fn load_gl() {
gl::load_with(|s| {
unsafe {
let c_str = s.to_c_str();
let c_str = CString::from_slice(s.as_bytes());
glXGetProcAddress(c_str.as_ptr()) as *const c_void
}
});
@ -126,7 +128,7 @@ impl Window {
}
impl WindowMethods for Window {
fn framebuffer_size(&self) -> TypedSize2D<DevicePixel,uint> {
fn framebuffer_size(&self) -> TypedSize2D<DevicePixel,u32> {
let browser = self.cef_browser.borrow();
match *browser {
None => TypedSize2D(400, 300),
@ -136,7 +138,7 @@ impl WindowMethods for Window {
.get_client()
.get_render_handler()
.get_backing_rect((*browser).clone(), &mut rect);
TypedSize2D(rect.width as uint, rect.height as uint)
TypedSize2D(rect.width as u32, rect.height as u32)
}
}
}
@ -274,8 +276,8 @@ impl WindowMethods for Window {
let frame = frame.downcast();
let mut title_visitor = frame.title_visitor.borrow_mut();
match &mut *title_visitor {
&None => {}
&Some(ref mut visitor) => {
&mut None => {}
&mut Some(ref mut visitor) => {
match string {
None => visitor.visit(&[]),
Some(string) => {

195
ports/cef/wrappers.rs
View file

@ -51,7 +51,7 @@ macro_rules! cef_noop_wrapper(
}
}
)
)
);
macro_rules! cef_pointer_wrapper(
($ty:ty) => (
@ -71,10 +71,10 @@ macro_rules! cef_pointer_wrapper(
mem::transmute::<*mut $ty,&'a mut $ty>(c_object)
}
}
cef_noop_wrapper!(*const $ty)
cef_noop_wrapper!(*mut $ty)
cef_noop_wrapper!(*const $ty);
cef_noop_wrapper!(*mut $ty);
)
)
);
macro_rules! cef_unimplemented_wrapper(
($c_type:ty, $rust_type:ty) => (
@ -87,95 +87,95 @@ macro_rules! cef_unimplemented_wrapper(
}
}
)
)
);
cef_pointer_wrapper!(())
cef_pointer_wrapper!(*mut ())
cef_pointer_wrapper!(*mut c_void)
cef_pointer_wrapper!(c_void)
cef_pointer_wrapper!(cef_base_t)
cef_pointer_wrapper!(cef_browser_settings_t)
cef_pointer_wrapper!(cef_cookie_t)
cef_pointer_wrapper!(cef_geoposition_t)
cef_pointer_wrapper!(cef_key_event)
cef_pointer_wrapper!(cef_mouse_event)
cef_pointer_wrapper!(cef_page_range_t)
cef_pointer_wrapper!(cef_point_t)
cef_pointer_wrapper!(cef_popup_features_t)
cef_pointer_wrapper!(cef_rect_t)
cef_pointer_wrapper!(cef_screen_info_t)
cef_pointer_wrapper!(cef_size_t)
cef_pointer_wrapper!(cef_time_t)
cef_pointer_wrapper!(cef_window_info_t)
cef_pointer_wrapper!(i32)
cef_pointer_wrapper!(i64)
cef_pointer_wrapper!(u32)
cef_pointer_wrapper!(u64)
cef_pointer_wrapper!(());
cef_pointer_wrapper!(*mut ());
cef_pointer_wrapper!(*mut c_void);
cef_pointer_wrapper!(c_void);
cef_pointer_wrapper!(cef_base_t);
cef_pointer_wrapper!(cef_browser_settings_t);
cef_pointer_wrapper!(cef_cookie_t);
cef_pointer_wrapper!(cef_geoposition_t);
cef_pointer_wrapper!(cef_key_event);
cef_pointer_wrapper!(cef_mouse_event);
cef_pointer_wrapper!(cef_page_range_t);
cef_pointer_wrapper!(cef_point_t);
cef_pointer_wrapper!(cef_popup_features_t);
cef_pointer_wrapper!(cef_rect_t);
cef_pointer_wrapper!(cef_screen_info_t);
cef_pointer_wrapper!(cef_size_t);
cef_pointer_wrapper!(cef_time_t);
cef_pointer_wrapper!(cef_window_info_t);
cef_pointer_wrapper!(i32);
cef_pointer_wrapper!(i64);
cef_pointer_wrapper!(u32);
cef_pointer_wrapper!(u64);
cef_noop_wrapper!(())
cef_noop_wrapper!(*const cef_geolocation_handler_t)
cef_noop_wrapper!(*const cef_string_utf16)
cef_noop_wrapper!(*mut cef_context_menu_handler_t)
cef_noop_wrapper!(*mut cef_dialog_handler_t)
cef_noop_wrapper!(*mut cef_download_handler_t)
cef_noop_wrapper!(*mut cef_drag_data_t)
cef_noop_wrapper!(*mut cef_drag_handler_t)
cef_noop_wrapper!(*mut cef_event_handle_t)
cef_noop_wrapper!(*mut cef_focus_handler_t)
cef_noop_wrapper!(*mut cef_geolocation_handler_t)
cef_noop_wrapper!(*mut cef_jsdialog_handler_t)
cef_noop_wrapper!(*mut cef_keyboard_handler_t)
cef_noop_wrapper!(*mut cef_load_handler_t)
cef_noop_wrapper!(*mut cef_request_handler_t)
cef_noop_wrapper!(*mut cef_string_list_t)
cef_noop_wrapper!(*mut cef_string_utf16)
cef_noop_wrapper!(c_int)
cef_noop_wrapper!(cef_color_model_t)
cef_noop_wrapper!(cef_context_menu_edit_state_flags_t)
cef_noop_wrapper!(cef_context_menu_media_state_flags_t)
cef_noop_wrapper!(cef_context_menu_media_type_t)
cef_noop_wrapper!(cef_context_menu_type_flags_t)
cef_noop_wrapper!(cef_dom_document_type_t)
cef_noop_wrapper!(cef_dom_node_type_t)
cef_noop_wrapper!(cef_drag_operations_mask_t)
cef_noop_wrapper!(cef_duplex_mode_t)
cef_noop_wrapper!(cef_errorcode_t)
cef_noop_wrapper!(cef_event_flags_t)
cef_noop_wrapper!(cef_event_handle_t)
cef_noop_wrapper!(cef_file_dialog_mode_t)
cef_noop_wrapper!(cef_focus_source_t)
cef_noop_wrapper!(cef_jsdialog_handler_t)
cef_noop_wrapper!(cef_jsdialog_type_t)
cef_noop_wrapper!(cef_key_event)
cef_noop_wrapper!(cef_menu_item_type_t)
cef_noop_wrapper!(cef_mouse_button_type_t)
cef_noop_wrapper!(cef_navigation_type_t)
cef_noop_wrapper!(cef_paint_element_type_t)
cef_noop_wrapper!(cef_postdataelement_type_t)
cef_noop_wrapper!(cef_process_id_t)
cef_noop_wrapper!(cef_resource_type_t)
cef_noop_wrapper!(cef_termination_status_t)
cef_noop_wrapper!(cef_text_input_context_t)
cef_noop_wrapper!(cef_thread_id_t)
cef_noop_wrapper!(cef_time_t)
cef_noop_wrapper!(cef_transition_type_t)
cef_noop_wrapper!(cef_urlrequest_status_t)
cef_noop_wrapper!(cef_v8_accesscontrol_t)
cef_noop_wrapper!(cef_v8_propertyattribute_t)
cef_noop_wrapper!(cef_value_type_t)
cef_noop_wrapper!(cef_xml_encoding_type_t)
cef_noop_wrapper!(cef_xml_node_type_t)
cef_noop_wrapper!(f64)
cef_noop_wrapper!(i64)
cef_noop_wrapper!(u32)
cef_noop_wrapper!(u64)
cef_noop_wrapper!(());
cef_noop_wrapper!(*const cef_geolocation_handler_t);
cef_noop_wrapper!(*const cef_string_utf16);
cef_noop_wrapper!(*mut cef_context_menu_handler_t);
cef_noop_wrapper!(*mut cef_dialog_handler_t);
cef_noop_wrapper!(*mut cef_download_handler_t);
cef_noop_wrapper!(*mut cef_drag_data_t);
cef_noop_wrapper!(*mut cef_drag_handler_t);
cef_noop_wrapper!(*mut cef_event_handle_t);
cef_noop_wrapper!(*mut cef_focus_handler_t);
cef_noop_wrapper!(*mut cef_geolocation_handler_t);
cef_noop_wrapper!(*mut cef_jsdialog_handler_t);
cef_noop_wrapper!(*mut cef_keyboard_handler_t);
cef_noop_wrapper!(*mut cef_load_handler_t);
cef_noop_wrapper!(*mut cef_request_handler_t);
cef_noop_wrapper!(*mut cef_string_list_t);
cef_noop_wrapper!(*mut cef_string_utf16);
cef_noop_wrapper!(c_int);
cef_noop_wrapper!(cef_color_model_t);
cef_noop_wrapper!(cef_context_menu_edit_state_flags_t);
cef_noop_wrapper!(cef_context_menu_media_state_flags_t);
cef_noop_wrapper!(cef_context_menu_media_type_t);
cef_noop_wrapper!(cef_context_menu_type_flags_t);
cef_noop_wrapper!(cef_dom_document_type_t);
cef_noop_wrapper!(cef_dom_node_type_t);
cef_noop_wrapper!(cef_drag_operations_mask_t);
cef_noop_wrapper!(cef_duplex_mode_t);
cef_noop_wrapper!(cef_errorcode_t);
cef_noop_wrapper!(cef_event_flags_t);
cef_noop_wrapper!(cef_event_handle_t);
cef_noop_wrapper!(cef_file_dialog_mode_t);
cef_noop_wrapper!(cef_focus_source_t);
cef_noop_wrapper!(cef_jsdialog_handler_t);
cef_noop_wrapper!(cef_jsdialog_type_t);
cef_noop_wrapper!(cef_key_event);
cef_noop_wrapper!(cef_menu_item_type_t);
cef_noop_wrapper!(cef_mouse_button_type_t);
cef_noop_wrapper!(cef_navigation_type_t);
cef_noop_wrapper!(cef_paint_element_type_t);
cef_noop_wrapper!(cef_postdataelement_type_t);
cef_noop_wrapper!(cef_process_id_t);
cef_noop_wrapper!(cef_resource_type_t);
cef_noop_wrapper!(cef_termination_status_t);
cef_noop_wrapper!(cef_text_input_context_t);
cef_noop_wrapper!(cef_thread_id_t);
cef_noop_wrapper!(cef_time_t);
cef_noop_wrapper!(cef_transition_type_t);
cef_noop_wrapper!(cef_urlrequest_status_t);
cef_noop_wrapper!(cef_v8_accesscontrol_t);
cef_noop_wrapper!(cef_v8_propertyattribute_t);
cef_noop_wrapper!(cef_value_type_t);
cef_noop_wrapper!(cef_xml_encoding_type_t);
cef_noop_wrapper!(cef_xml_node_type_t);
cef_noop_wrapper!(f64);
cef_noop_wrapper!(i64);
cef_noop_wrapper!(u32);
cef_noop_wrapper!(u64);
cef_unimplemented_wrapper!(*const *mut cef_v8value_t, *const CefV8Value)
cef_unimplemented_wrapper!(*mut *mut cef_post_data_element_t, *mut CefPostDataElement)
cef_unimplemented_wrapper!(cef_string_list_t, Vec<String>)
cef_unimplemented_wrapper!(cef_string_map_t, HashMap<String,String>)
cef_unimplemented_wrapper!(cef_string_multimap_t, HashMap<String,Vec<String>>)
cef_unimplemented_wrapper!(cef_string_t, String)
cef_unimplemented_wrapper!(*const *mut cef_v8value_t, *const CefV8Value);
cef_unimplemented_wrapper!(*mut *mut cef_post_data_element_t, *mut CefPostDataElement);
cef_unimplemented_wrapper!(cef_string_list_t, Vec<String>);
cef_unimplemented_wrapper!(cef_string_map_t, HashMap<String,String>);
cef_unimplemented_wrapper!(cef_string_multimap_t, HashMap<String,Vec<String>>);
cef_unimplemented_wrapper!(cef_string_t, String);
impl<'a> CefWrap<*const cef_string_t> for &'a [u16] {
fn to_c(buffer: &'a [u16]) -> *const cef_string_t {
@ -189,7 +189,7 @@ impl<'a> CefWrap<*const cef_string_t> for &'a [u16] {
let boxed_string = box cef_string_utf16 {
str: ptr,
length: buffer.len() as u64,
dtor: Some(free_boxed_utf16_string),
dtor: Some(free_boxed_utf16_string as extern "C" fn(*mut c_ushort)),
};
let result: *const cef_string_utf16 = &*boxed_string;
mem::forget(boxed_string);
@ -255,7 +255,7 @@ impl<'a> CefWrap<cef_string_userfree_t> for String {
*mut cef_string_utf16;
ptr::write(&mut (*boxed_string).str, buffer);
ptr::write(&mut (*boxed_string).length, utf16_chars.len() as u64);
ptr::write(&mut (*boxed_string).dtor, Some(free_utf16_buffer));
ptr::write(&mut (*boxed_string).dtor, Some(free_utf16_buffer as extern "C" fn(*mut c_ushort)));
mem::forget(utf16_chars);
}
boxed_string
@ -278,7 +278,7 @@ pub struct Utf16Encoder<I> {
}
impl<I> Utf16Encoder<I> {
pub fn new(chars: I) -> Utf16Encoder<I> where I: Iterator<char> {
pub fn new(chars: I) -> Utf16Encoder<I> where I: Iterator<Item=char> {
Utf16Encoder {
chars: chars,
extra: 0,
@ -286,13 +286,14 @@ impl<I> Utf16Encoder<I> {
}
}
impl<I> Iterator<u16> for Utf16Encoder<I> where I: Iterator<char> {
impl<I> Iterator for Utf16Encoder<I> where I: Iterator<Item=char> {
type Item = u16;
fn next(&mut self) -> Option<u16> {
if self.extra != 0 {
return Some(mem::replace(&mut self.extra, 0))
}
let mut buf = [0u16, ..2];
let mut buf = [0u16; 2];
self.chars.next().map(|ch| {
let n = ch.encode_utf16(buf.as_mut_slice()).unwrap_or(0);
if n == 2 {
@ -305,10 +306,10 @@ impl<I> Iterator<u16> for Utf16Encoder<I> where I: Iterator<char> {
impl<'a> CefWrap<cef_string_t> for &'a mut String {
fn to_c(_: &'a mut String) -> cef_string_t {
panic!("unimplemented CEF type conversion: &'a mut String")
panic!("unimplemented CEF type conversion: &'a mut String");
}
unsafe fn to_rust(_: cef_string_t) -> &'a mut String {
panic!("unimplemented CEF type conversion: cef_string_t")
panic!("unimplemented CEF type conversion: cef_string_t");
}
}

2
ports/cef/xml_reader.rs
View file

@ -9,6 +9,6 @@ cef_stub_static_method_impls! {
fn cef_xml_reader_create(stream: *mut cef_stream_reader_t,
encoding_type: cef_xml_encoding_type_t,
uri: *const cef_string_t)
-> *mut cef_xml_reader_t;
-> *mut cef_xml_reader_t
}

2
ports/cef/zip_reader.rs
View file

@ -5,6 +5,6 @@
use interfaces::{cef_stream_reader_t, cef_zip_reader_t};
cef_stub_static_method_impls! {
fn cef_zip_reader_create(stream: *mut cef_stream_reader_t) -> *mut cef_zip_reader_t;
fn cef_zip_reader_create(stream: *mut cef_stream_reader_t) -> *mut cef_zip_reader_t
}

4
ports/glfw/Cargo.toml
View file

@ -32,5 +32,5 @@ git = "https://github.com/servo/rust-cgl"
[dependencies.gleam]
git = "https://github.com/servo/gleam"
[dependencies.time]
git = "https://github.com/rust-lang/time"
[dependencies]
time = "*"

10
ports/glutin/Cargo.toml
View file

@ -27,8 +27,7 @@ path = "../../components/msg"
path = "../../components/util"
[dependencies.glutin]
git = "https://github.com/servo/glutin"
branch = "servo"
git = "https://github.com/tomaka/glutin"
[dependencies.gleam]
git = "https://github.com/servo/gleam"
@ -36,5 +35,8 @@ git = "https://github.com/servo/gleam"
[dependencies.cgl]
git = "https://github.com/servo/rust-cgl"
[dependencies.time]
git = "https://github.com/rust-lang/time"
[dependencies.egl]
git = "https://github.com/servo/rust-egl"
[dependencies]
time = "*"

4
ports/glutin/lib.rs
View file

@ -4,7 +4,7 @@
//! A simple application that uses GLFW to open a window for Servo to display in.
#![feature(macro_rules)]
#![feature(box_syntax, int_uint)]
#![deny(unused_imports, unused_variables)]
#[cfg(target_os="macos")]
@ -40,5 +40,5 @@ pub fn create_window() -> Rc<Window> {
let size = opts.initial_window_size.as_f32() * scale_factor;
// Open a window.
Window::new(foreground, size.as_uint())
Window::new(foreground, size.as_uint().cast().unwrap())
}

47
ports/glutin/window.rs
View file

@ -18,6 +18,7 @@ use msg::compositor_msg::{PaintState, ReadyState};
use msg::constellation_msg::LoadData;
use NestedEventLoopListener;
use std::rc::Rc;
use std::sync::mpsc::{channel, Sender};
use util::cursor::Cursor;
use util::geometry::ScreenPx;
@ -45,8 +46,8 @@ use std::ptr;
static mut g_nested_event_loop_listener: Option<*mut (NestedEventLoopListener + 'static)> = None;
#[cfg(feature = "window")]
bitflags!(
#[deriving(Show, Copy)]
bitflags! {
#[derive(Show)]
flags KeyModifiers: u8 {
const LEFT_CONTROL = 1,
const RIGHT_CONTROL = 2,
@ -55,7 +56,7 @@ bitflags!(
const LEFT_ALT = 16,
const RIGHT_ALT = 32,
}
)
}
/// The type of a window.
#[cfg(feature = "window")]
@ -63,10 +64,10 @@ pub struct Window {
window: glutin::Window,
mouse_down_button: Cell<Option<glutin::MouseButton>>,
mouse_down_point: Cell<Point2D<int>>,
mouse_down_point: Cell<Point2D<i32>>,
event_queue: RefCell<Vec<WindowEvent>>,
mouse_pos: Cell<Point2D<int>>,
mouse_pos: Cell<Point2D<i32>>,
ready_state: Cell<ReadyState>,
paint_state: Cell<PaintState>,
key_modifiers: Cell<KeyModifiers>,
@ -76,7 +77,7 @@ pub struct Window {
#[cfg(feature = "window")]
impl Window {
pub fn new(is_foreground: bool, window_size: TypedSize2D<DevicePixel, uint>) -> Rc<Window> {
pub fn new(is_foreground: bool, window_size: TypedSize2D<DevicePixel, u32>) -> Rc<Window> {
let mut glutin_window = glutin::WindowBuilder::new()
.with_title("Servo [glutin]".to_string())
.with_dimensions(window_size.to_untyped().width, window_size.to_untyped().height)
@ -86,7 +87,7 @@ impl Window {
.unwrap();
unsafe { glutin_window.make_current() };
glutin_window.set_window_resize_callback(Some(Window::nested_window_resize));
glutin_window.set_window_resize_callback(Some(Window::nested_window_resize as fn(u32, u32)));
Window::load_gl_functions(&glutin_window);
@ -112,7 +113,7 @@ impl Window {
Rc::new(window)
}
fn nested_window_resize(width: uint, height: uint) {
fn nested_window_resize(width: u32, height: u32) {
unsafe {
match g_nested_event_loop_listener {
None => {}
@ -124,12 +125,12 @@ impl Window {
}
#[cfg(not(target_os="android"))]
fn gl_version() -> (uint, uint) {
fn gl_version() -> (u32, u32) {
(3, 0)
}
#[cfg(target_os="android")]
fn gl_version() -> (uint, uint) {
fn gl_version() -> (u32, u32) {
(2, 0)
}
@ -225,7 +226,7 @@ impl Window {
}
/// Helper function to handle a click
fn handle_mouse(&self, button: glutin::MouseButton, action: glutin::ElementState, x: int, y: int) {
fn handle_mouse(&self, button: glutin::MouseButton, action: glutin::ElementState, x: i32, y: i32) {
// FIXME(tkuehn): max pixel dist should be based on pixel density
let max_pixel_dist = 10f64;
let event = match action {
@ -289,7 +290,7 @@ impl Window {
{
let mut event_queue = self.event_queue.borrow_mut();
if !event_queue.is_empty() {
return event_queue.remove(0).unwrap();
return event_queue.remove(0);
}
}
@ -317,7 +318,12 @@ impl Window {
if close_event || self.window.is_closed() {
WindowEvent::Quit
} else {
self.event_queue.borrow_mut().remove(0).unwrap_or(WindowEvent::Idle)
let mut event_queue = self.event_queue.borrow_mut();
if event_queue.is_empty() {
WindowEvent::Idle
} else {
event_queue.remove(0)
}
}
}
@ -434,8 +440,8 @@ impl Window {
#[cfg(feature = "window")]
impl WindowMethods for Window {
fn framebuffer_size(&self) -> TypedSize2D<DevicePixel, uint> {
let scale_factor = self.window.hidpi_factor() as uint;
fn framebuffer_size(&self) -> TypedSize2D<DevicePixel, u32> {
let scale_factor = self.window.hidpi_factor() as u32;
let (width, height) = self.window.get_inner_size().unwrap();
TypedSize2D(width * scale_factor, height * scale_factor)
}
@ -553,13 +559,13 @@ impl WindowMethods for Window {
pub struct Window {
#[allow(dead_code)]
context: glutin::HeadlessContext,
width: uint,
height: uint,
width: u32,
height: u32,
}
#[cfg(feature = "headless")]
impl Window {
pub fn new(_is_foreground: bool, window_size: TypedSize2D<DevicePixel, uint>) -> Rc<Window> {
pub fn new(_is_foreground: bool, window_size: TypedSize2D<DevicePixel, u32>) -> Rc<Window> {
let window_size = window_size.to_untyped();
let headless_builder = glutin::HeadlessRendererBuilder::new(window_size.width,
window_size.height);
@ -592,7 +598,7 @@ impl Window {
#[cfg(feature = "headless")]
impl WindowMethods for Window {
fn framebuffer_size(&self) -> TypedSize2D<DevicePixel, uint> {
fn framebuffer_size(&self) -> TypedSize2D<DevicePixel, u32> {
TypedSize2D(self.width, self.height)
}
@ -659,6 +665,9 @@ struct GlutinCompositorProxy {
window_proxy: Option<glutin::WindowProxy>,
}
// TODO: Should this be implemented here or upstream in glutin::WindowProxy?
unsafe impl Send for GlutinCompositorProxy {}
impl CompositorProxy for GlutinCompositorProxy {
fn send(&mut self, msg: compositor_task::Msg) {
// Send a message and kick the OS event loop awake.

8
ports/gonk/.cargo/config
View file

@ -1,11 +1,3 @@
# FIXME: Remove this next rustup. This is a temporary
# hack to allow android cross compilation to work. When
# this is removed, the support/time submodule can also
# be removed!
paths = [
"../../support/time"
]
[target.arm-linux-androideabi]
ar = "arm-linux-androideabi-ar"
linker = "arm-linux-androideabi-g++"

331
ports/gonk/Cargo.lock generated
View file

@ -15,7 +15,7 @@ dependencies = [
[[package]]
name = "azure"
version = "0.1.0"
source = "git+https://github.com/servo/rust-azure#d0acabef6221e5fd6840254dc23f91c66b874629"
source = "git+https://github.com/servo/rust-azure#2cc22b161a93f4016457f680b3966d879606d06d"
dependencies = [
"core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
"core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
@ -23,7 +23,7 @@ dependencies = [
"egl 0.1.0 (git+https://github.com/servo/rust-egl)",
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"skia-sys 0.0.20130412 (git+https://github.com/servo/skia?ref=upstream-2014-06-16)",
"skia-sys 0.0.20130412 (git+https://github.com/servo/skia?branch=upstream-2014-06-16)",
"xlib 0.1.0 (git+https://github.com/servo/rust-xlib)",
]
@ -62,25 +62,26 @@ dependencies = [
"net 0.0.1",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
"script_traits 0.0.1",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"url 0.2.4 (git+https://github.com/servo/rust-url)",
"time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
[[package]]
name = "cookie"
version = "0.1.0"
source = "git+https://github.com/alexcrichton/cookie-rs#8d1b4bb8d5ed06e58c162eb235a4ccd210b68108"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"openssl 0.2.4 (git+https://github.com/sfackler/rust-openssl)",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"url 0.2.4 (git+https://github.com/servo/rust-url)",
"openssl 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "core_foundation"
version = "0.1.0"
source = "git+https://github.com/servo/rust-core-foundation#81db9ab15f67e16d7a3e9705a06cad65192014fd"
source = "git+https://github.com/servo/rust-core-foundation#ce3d852765827b64a0d5fb2aadd77da39665b0b0"
[[package]]
name = "core_graphics"
@ -93,7 +94,7 @@ dependencies = [
[[package]]
name = "core_text"
version = "0.1.0"
source = "git+https://github.com/servo/rust-core-text#cb369a26a0eb4e83c2128ceb3c685a191113417a"
source = "git+https://github.com/servo/rust-core-text#b5cb33905350e99b2a19f5a22f7b1efea7ad48c2"
dependencies = [
"core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
"core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
@ -101,12 +102,12 @@ dependencies = [
[[package]]
name = "cssparser"
version = "0.1.1"
source = "git+https://github.com/servo/rust-cssparser#8d1b3e220e795f7baaa940919059d5f4ef4ec28c"
version = "0.2.0"
source = "git+https://github.com/servo/rust-cssparser#2a8c9f2c5f568495bae16f44b799be39b8efad39"
dependencies = [
"encoding 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"matches 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"text_writer 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"text_writer 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -128,63 +129,63 @@ dependencies = [
[[package]]
name = "egl"
version = "0.1.0"
source = "git+https://github.com/servo/rust-egl#88f2a13812ddbce2bf2317221663a61c31b3e220"
source = "git+https://github.com/servo/rust-egl#cd74c82a8537090edb6c16478e2261db2a8c0b4f"
[[package]]
name = "encoding"
version = "0.2.6"
version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"encoding-index-japanese 1.0.20140915 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding-index-korean 1.0.20140915 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding-index-simpchinese 1.0.20140915 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding-index-singlebyte 1.0.20140915 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding-index-tradchinese 1.0.20140915 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding-index-japanese 1.20141219.0 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding-index-korean 1.20141219.0 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding-index-simpchinese 1.20141219.0 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding-index-singlebyte 1.20141219.0 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding-index-tradchinese 1.20141219.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "encoding-index-japanese"
version = "1.0.20140915"
version = "1.20141219.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"encoding_index_tests 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding_index_tests 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "encoding-index-korean"
version = "1.0.20140915"
version = "1.20141219.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"encoding_index_tests 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding_index_tests 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "encoding-index-simpchinese"
version = "1.0.20140915"
version = "1.20141219.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"encoding_index_tests 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding_index_tests 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "encoding-index-singlebyte"
version = "1.0.20140915"
version = "1.20141219.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"encoding_index_tests 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding_index_tests 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "encoding-index-tradchinese"
version = "1.0.20140915"
version = "1.20141219.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"encoding_index_tests 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding_index_tests 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "encoding_index_tests"
version = "0.1.0"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@ -212,7 +213,7 @@ dependencies = [
[[package]]
name = "freetype"
version = "0.1.0"
source = "git+https://github.com/servo/rust-freetype#e55b06110fb2d74a2db68ead740db7e98fb98060"
source = "git+https://github.com/servo/rust-freetype#ec0231343a3ad360d86846c12895a0a0cbb19f79"
[[package]]
name = "freetype-sys"
@ -221,18 +222,18 @@ source = "git+https://github.com/servo/libfreetype2#f5c49c0da1d5bc6b206c41763440
[[package]]
name = "gcc"
version = "0.1.1"
source = "git+https://github.com/alexcrichton/gcc-rs#dfe97a119af4b2db53178eb8c3ca6be6589a152b"
version = "0.1.4"
source = "git+https://github.com/alexcrichton/gcc-rs#f5c52d956e0742a66e40c8301e634e136c3ae287"
[[package]]
name = "gcc"
version = "0.1.2"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "geom"
version = "0.1.0"
source = "git+https://github.com/servo/rust-geom#05f2d5494355adc78ad7d17286912f0d128f503b"
source = "git+https://github.com/servo/rust-geom#a4a4a03aa024412bf3f4e093c0198b433c6ad63f"
[[package]]
name = "gfx"
@ -254,40 +255,43 @@ dependencies = [
"script_traits 0.0.1",
"stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
"style 0.0.1",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"url 0.2.4 (git+https://github.com/servo/rust-url)",
"time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
[[package]]
name = "gl_common"
version = "0.0.1"
source = "git+https://github.com/bjz/gl-rs.git#b5e3f4f76c31bc1b459d5e4c10d879ffa4f67c6e"
version = "0.0.3"
source = "git+https://github.com/bjz/gl-rs.git#230e6c9ed611cddfcb6682dee9686471d54863d0"
[[package]]
name = "gl_generator"
version = "0.0.1"
source = "git+https://github.com/bjz/gl-rs.git#b5e3f4f76c31bc1b459d5e4c10d879ffa4f67c6e"
version = "0.0.12"
source = "git+https://github.com/bjz/gl-rs.git#230e6c9ed611cddfcb6682dee9686471d54863d0"
dependencies = [
"gl_common 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
"khronos_api 0.0.2 (git+https://github.com/bjz/gl-rs.git)",
"xml-rs 0.1.3 (git+https://github.com/netvl/xml-rs)",
"gl_common 0.0.3 (git+https://github.com/bjz/gl-rs.git)",
"khronos_api 0.0.5 (git+https://github.com/bjz/gl-rs.git)",
"log 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xml-rs 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "gleam"
version = "0.0.1"
source = "git+https://github.com/servo/gleam#c54eb9ad6d4b62b7effbe9c79a1b3720845b45b4"
source = "git+https://github.com/servo/gleam#8a23e963c5b8e1a727a80fb009d71e2f9efb6a89"
dependencies = [
"gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
"gl_common 0.0.3 (git+https://github.com/bjz/gl-rs.git)",
"gl_generator 0.0.12 (git+https://github.com/bjz/gl-rs.git)",
]
[[package]]
name = "glx"
version = "0.0.1"
source = "git+https://github.com/servo/rust-glx#7126ffa09fcfcc9f85f1406f3b5db729f5fdb7c3"
source = "git+https://github.com/servo/rust-glx#f056a8998987f6f081f9ad7fa396beb1b2988c02"
dependencies = [
"gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
"gl_common 0.0.3 (git+https://github.com/bjz/gl-rs.git)",
"gl_generator 0.0.12 (git+https://github.com/bjz/gl-rs.git)",
]
[[package]]
@ -298,33 +302,36 @@ source = "git+https://github.com/servo/rust-harfbuzz#59b5b18087418404d661784934c
[[package]]
name = "html5ever"
version = "0.0.0"
source = "git+https://github.com/servo/html5ever#0abe5e30cc03f9e73bfd4fdc018192d149c21fb3"
source = "git+https://github.com/servo/html5ever#d35dfaaf0d85007057a299afc370d07e92538944"
dependencies = [
"html5ever_macros 0.0.0 (git+https://github.com/servo/html5ever)",
"phf 0.0.1 (git+https://github.com/sfackler/rust-phf)",
"phf_mac 0.0.1 (git+https://github.com/sfackler/rust-phf)",
"phf 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
"phf_mac 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.0.0 (git+https://github.com/servo/string-cache)",
"string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache)",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "html5ever_macros"
version = "0.0.0"
source = "git+https://github.com/servo/html5ever#0abe5e30cc03f9e73bfd4fdc018192d149c21fb3"
source = "git+https://github.com/servo/html5ever#d35dfaaf0d85007057a299afc370d07e92538944"
[[package]]
name = "hyper"
version = "0.0.1"
source = "git+https://github.com/servo/hyper?ref=servo#43becc919c24939b8b84fe541b0e0898a4827836"
version = "0.1.0"
source = "git+https://github.com/servo/hyper?branch=servo#248a6f29086baa841eb30c88540dca3196accae4"
dependencies = [
"cookie 0.1.0 (git+https://github.com/alexcrichton/cookie-rs)",
"mime 0.0.1 (git+https://github.com/hyperium/mime.rs)",
"mucell 0.1.2 (git+https://github.com/chris-morgan/mucell)",
"openssl 0.2.4 (git+https://github.com/sfackler/rust-openssl)",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"unsafe-any 0.1.1 (git+https://github.com/reem/rust-unsafe-any)",
"url 0.2.4 (git+https://github.com/servo/rust-url)",
"cookie 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"mime 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
"mucell 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
"unicase 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"unsafe-any 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -341,20 +348,20 @@ dependencies = [
[[package]]
name = "js"
version = "0.1.0"
source = "git+https://github.com/servo/rust-mozjs#5a69e377d6ab7ea8601f711443994f1c8172c7a8"
source = "git+https://github.com/servo/rust-mozjs#6cabb12f858f27d23fc3d2d9f0c334b80eb56573"
dependencies = [
"mozjs-sys 0.0.0 (git+https://github.com/servo/mozjs)",
]
[[package]]
name = "khronos_api"
version = "0.0.2"
source = "git+https://github.com/bjz/gl-rs.git#b5e3f4f76c31bc1b459d5e4c10d879ffa4f67c6e"
version = "0.0.5"
source = "git+https://github.com/bjz/gl-rs.git#230e6c9ed611cddfcb6682dee9686471d54863d0"
[[package]]
name = "layers"
version = "0.1.0"
source = "git+https://github.com/servo/rust-layers#f20270839f8658a2b19eae6fade9325efe5f4578"
source = "git+https://github.com/servo/rust-layers#84d6d2cd2d09489eb10af7167fa34c914a8bee71"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
@ -371,8 +378,9 @@ dependencies = [
name = "layout"
version = "0.0.1"
dependencies = [
"cssparser 0.1.1 (git+https://github.com/servo/rust-cssparser)",
"encoding 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas 0.0.1",
"cssparser 0.2.0 (git+https://github.com/servo/rust-cssparser)",
"encoding 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gfx 0.0.1",
"layout_traits 0.0.1",
@ -383,7 +391,7 @@ dependencies = [
"string_cache 0.0.0 (git+https://github.com/servo/string-cache)",
"string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache)",
"style 0.0.1",
"url 0.2.4 (git+https://github.com/servo/rust-url)",
"url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@ -400,8 +408,8 @@ dependencies = [
[[package]]
name = "lazy_static"
version = "0.1.0"
source = "git+https://github.com/Kimundi/lazy-static.rs#76f06e4fa7bc8c92f11d1def19bd4ddfd8017cd8"
version = "0.1.6"
source = "git+https://github.com/Kimundi/lazy-static.rs#31a7aa0176ecd70b4aab274a40d1e2cd78c1fbf8"
[[package]]
name = "libressl-pnacl-sys"
@ -411,15 +419,26 @@ dependencies = [
"pnacl-build-helper 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "log"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"regex 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "matches"
version = "0.1.0"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "mime"
version = "0.0.1"
source = "git+https://github.com/hyperium/mime.rs#7898f1c29c7f5d35d0c3c7aed37ebcfc95a40873"
version = "0.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"log 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "mozjs-sys"
@ -433,44 +452,44 @@ dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"hyper 0.0.1 (git+https://github.com/servo/hyper?ref=servo)",
"hyper 0.1.0 (git+https://github.com/servo/hyper?branch=servo)",
"io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"style 0.0.1",
"url 0.2.4 (git+https://github.com/servo/rust-url)",
"url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
[[package]]
name = "mucell"
version = "0.1.2"
source = "git+https://github.com/chris-morgan/mucell#d198c6605b3e688719db168db0939051c803b1ea"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "net"
version = "0.0.1"
dependencies = [
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"hyper 0.0.1 (git+https://github.com/servo/hyper?ref=servo)",
"hyper 0.1.0 (git+https://github.com/servo/hyper?branch=servo)",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
"stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"url 0.2.4 (git+https://github.com/servo/rust-url)",
"time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
[[package]]
name = "openssl"
version = "0.2.4"
source = "git+https://github.com/sfackler/rust-openssl#f299e336d06a85438c3ee90aa06235510f3f5dbe"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"openssl-sys 0.2.4 (git+https://github.com/sfackler/rust-openssl)",
"openssl-sys 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "openssl-sys"
version = "0.2.4"
source = "git+https://github.com/sfackler/rust-openssl#f299e336d06a85438c3ee90aa06235510f3f5dbe"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libressl-pnacl-sys 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -478,21 +497,25 @@ dependencies = [
[[package]]
name = "phf"
version = "0.0.1"
source = "git+https://github.com/sfackler/rust-phf#6a7cc6eb9ec08b103b6b62fa39bdb3229f3cdbe4"
version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"xxhash 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"phf_shared 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "phf_mac"
version = "0.0.1"
source = "git+https://github.com/sfackler/rust-phf#6a7cc6eb9ec08b103b6b62fa39bdb3229f3cdbe4"
version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"time 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"xxhash 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"phf_shared 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "phf_shared"
version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "pkg-config"
version = "0.1.2"
@ -510,29 +533,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "png"
version = "0.1.0"
source = "git+https://github.com/servo/rust-png#cc1976df347bb21ac78c5b37e651b85878855991"
source = "git+https://github.com/servo/rust-png#2804379427ced963466d19132b816bb06a8a4006"
dependencies = [
"gcc 0.1.1 (git+https://github.com/alexcrichton/gcc-rs)",
"gcc 0.1.4 (git+https://github.com/alexcrichton/gcc-rs)",
"png-sys 1.6.16 (git+https://github.com/servo/rust-png)",
]
[[package]]
name = "png-sys"
version = "1.6.16"
source = "git+https://github.com/servo/rust-png#cc1976df347bb21ac78c5b37e651b85878855991"
source = "git+https://github.com/servo/rust-png#2804379427ced963466d19132b816bb06a8a4006"
[[package]]
name = "regex"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "rustc-serialize"
version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "script"
version = "0.0.1"
dependencies = [
"canvas 0.0.1",
"cssparser 0.1.1 (git+https://github.com/servo/rust-cssparser)",
"cssparser 0.2.0 (git+https://github.com/servo/rust-cssparser)",
"devtools_traits 0.0.1",
"encoding 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gfx 0.0.1",
"html5ever 0.0.0 (git+https://github.com/servo/html5ever)",
"hyper 0.0.1 (git+https://github.com/servo/hyper?ref=servo)",
"hyper 0.1.0 (git+https://github.com/servo/hyper?branch=servo)",
"js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
"msg 0.0.1",
"net 0.0.1",
@ -541,10 +574,10 @@ dependencies = [
"string_cache 0.0.0 (git+https://github.com/servo/string-cache)",
"string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache)",
"style 0.0.1",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"url 0.2.4 (git+https://github.com/servo/rust-url)",
"time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
"uuid 0.1.1 (git+https://github.com/rust-lang/uuid)",
"uuid 0.1.7 (git+https://github.com/rust-lang/uuid)",
]
[[package]]
@ -555,7 +588,7 @@ dependencies = [
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"msg 0.0.1",
"net 0.0.1",
"url 0.2.4 (git+https://github.com/servo/rust-url)",
"url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@ -564,20 +597,22 @@ name = "servo"
version = "0.0.1"
dependencies = [
"compositing 0.0.1",
"devtools 0.0.1",
"gfx 0.0.1",
"layout 0.0.1",
"msg 0.0.1",
"net 0.0.1",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
"script 0.0.1",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"url 0.2.4 (git+https://github.com/servo/rust-url)",
"time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
[[package]]
name = "skia-sys"
version = "0.0.20130412"
source = "git+https://github.com/servo/skia?ref=upstream-2014-06-16#35649d0cddfd89c0bfee0ff558da7291e26d30c3"
source = "git+https://github.com/servo/skia?branch=upstream-2014-06-16#35649d0cddfd89c0bfee0ff558da7291e26d30c3"
dependencies = [
"expat-sys 2.1.0 (git+https://github.com/servo/libexpat)",
"freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)",
@ -586,42 +621,42 @@ dependencies = [
[[package]]
name = "stb_image"
version = "0.1.0"
source = "git+https://github.com/servo/rust-stb-image#97d7e440e80e41a304647363c322eab68e3700aa"
source = "git+https://github.com/servo/rust-stb-image#2ba03a447b9ef101c25e07bb7f8876416e5fcd71"
[[package]]
name = "string_cache"
version = "0.0.0"
source = "git+https://github.com/servo/string-cache#661c537b85f19ac81dfcd84e28557d480b6b7a9f"
source = "git+https://github.com/servo/string-cache#43a1e5d0d0f2a45e2b96160c8fbe6e1d9602cfa9"
dependencies = [
"lazy_static 0.1.0 (git+https://github.com/Kimundi/lazy-static.rs)",
"phf 0.0.1 (git+https://github.com/sfackler/rust-phf)",
"phf_mac 0.0.1 (git+https://github.com/sfackler/rust-phf)",
"lazy_static 0.1.6 (git+https://github.com/Kimundi/lazy-static.rs)",
"phf 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
"phf_mac 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache)",
"xxhash 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"xxhash 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "string_cache_macros"
version = "0.0.0"
source = "git+https://github.com/servo/string-cache#661c537b85f19ac81dfcd84e28557d480b6b7a9f"
source = "git+https://github.com/servo/string-cache#43a1e5d0d0f2a45e2b96160c8fbe6e1d9602cfa9"
dependencies = [
"lazy_static 0.1.0 (git+https://github.com/Kimundi/lazy-static.rs)",
"lazy_static 0.1.6 (git+https://github.com/Kimundi/lazy-static.rs)",
]
[[package]]
name = "style"
version = "0.0.1"
dependencies = [
"cssparser 0.1.1 (git+https://github.com/servo/rust-cssparser)",
"encoding 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"cssparser 0.2.0 (git+https://github.com/servo/rust-cssparser)",
"encoding 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"lazy_static 0.1.0 (git+https://github.com/Kimundi/lazy-static.rs)",
"matches 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 0.1.6 (git+https://github.com/Kimundi/lazy-static.rs)",
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1",
"string_cache 0.0.0 (git+https://github.com/servo/string-cache)",
"string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache)",
"text_writer 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.4 (git+https://github.com/servo/rust-url)",
"text_writer 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@ -631,55 +666,59 @@ version = "0.0.1"
[[package]]
name = "text_writer"
version = "0.1.4"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "time"
version = "0.1.0"
source = "git+https://github.com/rust-lang/time#afab521f3b91658a3ba2d3e877b7e01699733bef"
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"gcc 0.1.1 (git+https://github.com/alexcrichton/gcc-rs)",
"gcc 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "time"
version = "0.1.3"
name = "unicase"
version = "0.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"gcc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "unsafe-any"
version = "0.1.1"
source = "git+https://github.com/reem/rust-unsafe-any#eb3fe87bea85f375b8fcefa0cdecfd131fae9624"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "url"
version = "0.2.4"
source = "git+https://github.com/servo/rust-url#79f8034a8e1815ffa1f49204572ddbf6eb747c75"
version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "util"
version = "0.0.1"
dependencies = [
"cssparser 0.1.1 (git+https://github.com/servo/rust-cssparser)",
"cssparser 0.2.0 (git+https://github.com/servo/rust-cssparser)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"plugins 0.0.1",
"string_cache 0.0.0 (git+https://github.com/servo/string-cache)",
"string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache)",
"task_info 0.0.1",
"text_writer 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"url 0.2.4 (git+https://github.com/servo/rust-url)",
"text_writer 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "uuid"
version = "0.1.1"
source = "git+https://github.com/rust-lang/uuid#fc793c974a25c126c5cf5daa3b18973512a7a6a0"
version = "0.1.7"
source = "git+https://github.com/rust-lang/uuid#3ea51ffa0682c820e8c8b505de078e3bc93e2cb3"
dependencies = [
"rustc-serialize 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "xlib"
@ -688,11 +727,11 @@ source = "git+https://github.com/servo/rust-xlib#58ec3847b592aeabdcfeb6a2d02033d
[[package]]
name = "xml-rs"
version = "0.1.3"
source = "git+https://github.com/netvl/xml-rs#1a812d3ba720afd768bd75d29a5b5f10ddcdfbeb"
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "xxhash"
version = "0.0.3"
version = "0.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"

6
ports/gonk/src/lib.rs
View file

@ -2,19 +2,19 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#![feature(globs, macro_rules, phase, thread_local)]
#![feature(macro_rules, phase, thread_local)]
#![deny(unused_imports)]
#![deny(unused_variables)]
#[phase(plugin, link)]
#[macro_use]
extern crate log;
extern crate compositing;
extern crate devtools;
extern crate "net" as servo_net;
extern crate "msg" as servo_msg;
#[phase(plugin, link)]
#[macro_use]
extern crate "util" as servo_util;
extern crate script;
extern crate layout;

2
ports/gonk/src/window.rs
View file

@ -147,7 +147,7 @@ pub struct hwc_color {
}
#[repr(C)]
#[deriving(Copy)]
#[derive(Copy)]
pub struct hwc_rect {
left: c_int,
top: c_int,