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

Update rustc to revision 3dcd2157403163789aaf21a9ab3c4d30a7c6494d.

Browse source
This commit is contained in:
Ms2ger 2014-12-17 10:42:52 +01:00 • committed by Josh Matthews
parent b8900782b0
commit 466faac2a5
223 changed files with 4414 additions and 4105 deletions
Download patch file Download diff file Expand all files Collapse all files

173
ports/cef/Cargo.lock generated
View file

@ -27,7 +27,7 @@ dependencies = [
[[package]]
name = "azure"
version = "0.1.0"
source = "git+https://github.com/servo/rust-azure#e8323588209b47a07b67f61812c75dfeb2ad6851"
source = "git+https://github.com/servo/rust-azure#fe95551ca22f2a75b0dd690a72841df39b33885d"
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)",
@ -80,6 +80,7 @@ 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.1.0 (git+https://github.com/servo/rust-url)",
"util 0.0.1",
]
@ -87,16 +88,17 @@ dependencies = [
[[package]]
name = "cookie"
version = "0.0.1"
source = "git+https://github.com/servo/cookie-rs#30520767a95b92e39265aaf6822db515b2418f1d"
source = "git+https://github.com/servo/cookie-rs#f82090b19c2738b90528167ef873d8eac0353294"
dependencies = [
"openssl 0.0.1 (git+https://github.com/servo/rust-openssl)",
"openssl 0.0.2 (git+https://github.com/servo/rust-openssl)",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"url 0.1.0 (git+https://github.com/servo/rust-url)",
]
[[package]]
name = "core_foundation"
version = "0.1.0"
source = "git+https://github.com/servo/rust-core-foundation#6fa0b908f3912e20d081193e83bf5a9aa958fb83"
source = "git+https://github.com/servo/rust-core-foundation#d2dbe4fb6f6892521a37735cd7a97098d1b64808"
[[package]]
name = "core_graphics"
@ -118,9 +120,9 @@ dependencies = [
[[package]]
name = "cssparser"
version = "0.1.0"
source = "git+https://github.com/servo/rust-cssparser#3f98f1308b769b5d61efc6c133ac520df2b074ac"
source = "git+https://github.com/servo/rust-cssparser#97d8c3b20a240881573748d4eadcda610bfb888c"
dependencies = [
"encoding 0.2.0 (git+https://github.com/lifthrasiir/rust-encoding)",
"encoding 0.2.3 (git+https://github.com/lifthrasiir/rust-encoding)",
]
[[package]]
@ -146,8 +148,8 @@ source = "git+https://github.com/servo/rust-egl#88f2a13812ddbce2bf2317221663a61c
[[package]]
name = "encoding"
version = "0.2.0"
source = "git+https://github.com/lifthrasiir/rust-encoding#a06637cc6d0da37c12c68661e2ee9ca1999764a4"
version = "0.2.3"
source = "git+https://github.com/lifthrasiir/rust-encoding#15ac0ded3ca592c31ded5b9ff6f9fe2fa4b73fc4"
dependencies = [
"encoding-index-japanese 1.0.20140915 (git+https://github.com/lifthrasiir/rust-encoding)",
"encoding-index-korean 1.0.20140915 (git+https://github.com/lifthrasiir/rust-encoding)",
@ -159,27 +161,47 @@ dependencies = [
[[package]]
name = "encoding-index-japanese"
version = "1.0.20140915"
source = "git+https://github.com/lifthrasiir/rust-encoding#a06637cc6d0da37c12c68661e2ee9ca1999764a4"
source = "git+https://github.com/lifthrasiir/rust-encoding#15ac0ded3ca592c31ded5b9ff6f9fe2fa4b73fc4"
dependencies = [
"encoding_index_tests 0.1.0 (git+https://github.com/lifthrasiir/rust-encoding)",
]
[[package]]
name = "encoding-index-korean"
version = "1.0.20140915"
source = "git+https://github.com/lifthrasiir/rust-encoding#a06637cc6d0da37c12c68661e2ee9ca1999764a4"
source = "git+https://github.com/lifthrasiir/rust-encoding#15ac0ded3ca592c31ded5b9ff6f9fe2fa4b73fc4"
dependencies = [
"encoding_index_tests 0.1.0 (git+https://github.com/lifthrasiir/rust-encoding)",
]
[[package]]
name = "encoding-index-simpchinese"
version = "1.0.20140915"
source = "git+https://github.com/lifthrasiir/rust-encoding#a06637cc6d0da37c12c68661e2ee9ca1999764a4"
source = "git+https://github.com/lifthrasiir/rust-encoding#15ac0ded3ca592c31ded5b9ff6f9fe2fa4b73fc4"
dependencies = [
"encoding_index_tests 0.1.0 (git+https://github.com/lifthrasiir/rust-encoding)",
]
[[package]]
name = "encoding-index-singlebyte"
version = "1.0.20140915"
source = "git+https://github.com/lifthrasiir/rust-encoding#a06637cc6d0da37c12c68661e2ee9ca1999764a4"
source = "git+https://github.com/lifthrasiir/rust-encoding#15ac0ded3ca592c31ded5b9ff6f9fe2fa4b73fc4"
dependencies = [
"encoding_index_tests 0.1.0 (git+https://github.com/lifthrasiir/rust-encoding)",
]
[[package]]
name = "encoding-index-tradchinese"
version = "1.0.20140915"
source = "git+https://github.com/lifthrasiir/rust-encoding#a06637cc6d0da37c12c68661e2ee9ca1999764a4"
source = "git+https://github.com/lifthrasiir/rust-encoding#15ac0ded3ca592c31ded5b9ff6f9fe2fa4b73fc4"
dependencies = [
"encoding_index_tests 0.1.0 (git+https://github.com/lifthrasiir/rust-encoding)",
]
[[package]]
name = "encoding_index_tests"
version = "0.1.0"
source = "git+https://github.com/lifthrasiir/rust-encoding#15ac0ded3ca592c31ded5b9ff6f9fe2fa4b73fc4"
[[package]]
name = "expat-sys"
@ -213,6 +235,11 @@ name = "freetype-sys"
version = "2.4.11"
source = "git+https://github.com/servo/libfreetype2#f5c49c0da1d5bc6b206c4176344012ac37524243"
[[package]]
name = "gcc"
version = "0.0.2"
source = "git+https://github.com/alexcrichton/gcc-rs#903e8f8a2e3766ad3d514404d452dbaa1d3b2d79"
[[package]]
name = "geom"
version = "0.1.0"
@ -238,6 +265,7 @@ 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.1.0 (git+https://github.com/servo/rust-url)",
"util 0.0.1",
]
@ -245,16 +273,16 @@ dependencies = [
[[package]]
name = "gl_common"
version = "0.0.1"
source = "git+https://github.com/bjz/gl-rs.git#79cd3b3f9f19aa0e39f6af572fc8673a6d9760bc"
source = "git+https://github.com/bjz/gl-rs.git#c76c23fc9a0dae824b45550d4b823cdb726f242d"
[[package]]
name = "gl_generator"
version = "0.0.1"
source = "git+https://github.com/bjz/gl-rs.git#79cd3b3f9f19aa0e39f6af572fc8673a6d9760bc"
source = "git+https://github.com/bjz/gl-rs.git#c76c23fc9a0dae824b45550d4b823cdb726f242d"
dependencies = [
"gl_common 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
"khronos_api 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
"rust-xml 0.1.0 (git+https://github.com/netvl/rust-xml)",
"khronos_api 0.0.2 (git+https://github.com/bjz/gl-rs.git)",
"rust-xml 0.1.2-pre (git+https://github.com/netvl/rust-xml)",
]
[[package]]
@ -268,10 +296,10 @@ dependencies = [
[[package]]
name = "glfw"
version = "0.0.1"
source = "git+https://github.com/servo/glfw-rs?ref=servo#46f82b46589720f202ab2d4a99e4f4fd48df6469"
source = "git+https://github.com/servo/glfw-rs?ref=servo#1b05fdc7eab45e1d462758ab991065ee78593b7f"
dependencies = [
"glfw-sys 3.0.4 (git+https://github.com/servo/glfw?ref=cargo-3.0.4)",
"semver 0.1.0 (git+https://github.com/rust-lang/semver)",
"semver 0.1.3 (git+https://github.com/rust-lang/semver)",
]
[[package]]
@ -290,6 +318,7 @@ dependencies = [
"glfw 0.0.1 (git+https://github.com/servo/glfw-rs?ref=servo)",
"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)",
"util 0.0.1",
]
@ -309,30 +338,30 @@ source = "git+https://github.com/servo/rust-harfbuzz#8aab215463214647b7a81f66011
[[package]]
name = "html5ever"
version = "0.0.0"
source = "git+https://github.com/servo/html5ever?ref=servo#87c7e8b710391338b2463652be835f498923653c"
source = "git+https://github.com/servo/html5ever#e6f8d83de9fffe63a825d95d957ba6bcbc3e1632"
dependencies = [
"html5ever_macros 0.0.0 (git+https://github.com/servo/html5ever?ref=servo)",
"html5ever_macros 0.0.0 (git+https://github.com/servo/html5ever)",
"phf 0.0.0 (git+https://github.com/sfackler/rust-phf)",
"phf_mac 0.0.0 (git+https://github.com/sfackler/rust-phf)",
"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)",
]
[[package]]
name = "html5ever_macros"
version = "0.0.0"
source = "git+https://github.com/servo/html5ever?ref=servo#87c7e8b710391338b2463652be835f498923653c"
source = "git+https://github.com/servo/html5ever#e6f8d83de9fffe63a825d95d957ba6bcbc3e1632"
[[package]]
name = "hyper"
version = "0.0.1"
source = "git+https://github.com/servo/hyper?ref=servo#dd9d1830f35f7a8371b1b3bcb2d3e9cf2763f33f"
source = "git+https://github.com/servo/hyper?ref=servo#9c70c58e65ec80446fdb6e338f1060589b562f8c"
dependencies = [
"cookie 0.0.1 (git+https://github.com/servo/cookie-rs)",
"mime 0.0.1 (git+https://github.com/hyperium/mime.rs)",
"move-acceptor 0.0.1 (git+https://github.com/reem/rust-move-acceptor)",
"openssl 0.0.1 (git+https://github.com/servo/rust-openssl)",
"typeable 0.0.3 (git+https://github.com/reem/rust-typeable)",
"openssl 0.0.2 (git+https://github.com/servo/rust-openssl)",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"unsafe-any 0.1.0 (git+https://github.com/reem/rust-unsafe-any)",
"url 0.1.0 (git+https://github.com/servo/rust-url)",
]
@ -351,20 +380,20 @@ dependencies = [
[[package]]
name = "js"
version = "0.1.0"
source = "git+https://github.com/servo/rust-mozjs#7563bbd5abf12a1f0d01661c525b1f2491f783a9"
source = "git+https://github.com/servo/rust-mozjs#e04e7307a3e52f46bc9ba3d5682188285110bc67"
dependencies = [
"mozjs-sys 0.0.0 (git+https://github.com/servo/mozjs)",
]
[[package]]
name = "khronos_api"
version = "0.0.1"
source = "git+https://github.com/bjz/gl-rs.git#79cd3b3f9f19aa0e39f6af572fc8673a6d9760bc"
version = "0.0.2"
source = "git+https://github.com/bjz/gl-rs.git#c76c23fc9a0dae824b45550d4b823cdb726f242d"
[[package]]
name = "layers"
version = "0.1.0"
source = "git+https://github.com/servo/rust-layers#63d1093f2a01a6fb9599ea6d932aadf79598451f"
source = "git+https://github.com/servo/rust-layers#5fbdc521b82296e325d2df13fce8026c727c01d2"
dependencies = [
"cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
"core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
@ -381,7 +410,7 @@ name = "layout"
version = "0.0.1"
dependencies = [
"cssparser 0.1.0 (git+https://github.com/servo/rust-cssparser)",
"encoding 0.2.0 (git+https://github.com/lifthrasiir/rust-encoding)",
"encoding 0.2.3 (git+https://github.com/lifthrasiir/rust-encoding)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gfx 0.0.1",
"layout_traits 0.0.1",
@ -414,8 +443,8 @@ source = "git+https://github.com/Kimundi/lazy-static.rs#62976cb611c5396e11315ae6
[[package]]
name = "libressl-pnacl-sys"
version = "2.0.2"
source = "git+https://github.com/DiamondLovesYou/libressl-pnacl-sys.git#8e9349e0280b069bfab247a2202cd10b8beae154"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"pnacl-build-helper 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -423,12 +452,7 @@ dependencies = [
[[package]]
name = "mime"
version = "0.0.1"
source = "git+https://github.com/hyperium/mime.rs#5264e04655974f85c8d6581395cc24597266c653"
[[package]]
name = "move-acceptor"
version = "0.0.1"
source = "git+https://github.com/reem/rust-move-acceptor#25c5c33a83f605fdd0f3d37d2589e2b0b4e6cbd1"
source = "git+https://github.com/hyperium/mime.rs#7898f1c29c7f5d35d0c3c7aed37ebcfc95a40873"
[[package]]
name = "mozjs-sys"
@ -457,31 +481,32 @@ dependencies = [
"hyper 0.0.1 (git+https://github.com/servo/hyper?ref=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.1.0 (git+https://github.com/servo/rust-url)",
"util 0.0.1",
]
[[package]]
name = "openssl"
version = "0.0.1"
source = "git+https://github.com/servo/rust-openssl#82b520100532dba9a4cdd4588709eaedb37c7a77"
version = "0.0.2"
source = "git+https://github.com/servo/rust-openssl#19d9b53a86d602e16ab2274813a517cfaa4a2512"
dependencies = [
"libressl-pnacl-sys 2.0.2 (git+https://github.com/DiamondLovesYou/libressl-pnacl-sys.git)",
"openssl-sys 0.0.1 (git+https://github.com/servo/rust-openssl)",
"libressl-pnacl-sys 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl-sys 0.0.2 (git+https://github.com/servo/rust-openssl)",
]
[[package]]
name = "openssl-sys"
version = "0.0.1"
source = "git+https://github.com/servo/rust-openssl#82b520100532dba9a4cdd4588709eaedb37c7a77"
version = "0.0.2"
source = "git+https://github.com/servo/rust-openssl#19d9b53a86d602e16ab2274813a517cfaa4a2512"
dependencies = [
"pkg-config 0.1.0 (git+https://github.com/alexcrichton/pkg-config-rs)",
"pkg-config 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "phf"
version = "0.0.0"
source = "git+https://github.com/sfackler/rust-phf#18a5ecc028055c3dbd650cc5a064b6fb033d82ef"
source = "git+https://github.com/sfackler/rust-phf#aa3e2d0aedea4d55c2e4cea1bdf6e89418dc1206"
dependencies = [
"xxhash 0.0.1 (git+https://github.com/Jurily/rust-xxhash)",
]
@ -489,15 +514,16 @@ dependencies = [
[[package]]
name = "phf_mac"
version = "0.0.0"
source = "git+https://github.com/sfackler/rust-phf#18a5ecc028055c3dbd650cc5a064b6fb033d82ef"
source = "git+https://github.com/sfackler/rust-phf#aa3e2d0aedea4d55c2e4cea1bdf6e89418dc1206"
dependencies = [
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"xxhash 0.0.1 (git+https://github.com/Jurily/rust-xxhash)",
]
[[package]]
name = "pkg-config"
version = "0.1.0"
source = "git+https://github.com/alexcrichton/pkg-config-rs#9b3b44a2e1a8ccc70c3f701aeb5154ad79e665e9"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "plugins"
@ -511,7 +537,7 @@ 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#b0b4acde0080dd475dee93615276bfc19207a21e"
source = "git+https://github.com/servo/rust-png#f060a2d9484a150de286f930eb80f9f3bff3ea38"
dependencies = [
"png-sys 1.6.3 (git+https://github.com/servo/libpng?ref=servo)",
]
@ -523,8 +549,8 @@ source = "git+https://github.com/servo/libpng?ref=servo#d01f32b4eb86904695efe7fc
[[package]]
name = "rust-xml"
version = "0.1.0"
source = "git+https://github.com/netvl/rust-xml#d6c57380a300b94f7e7881979dbe5459dbe4ca06"
version = "0.1.2-pre"
source = "git+https://github.com/netvl/rust-xml#2d9df3267aeaa4d442e1e19a4dfed733cb1397ed"
[[package]]
name = "script"
@ -533,10 +559,10 @@ dependencies = [
"canvas 0.0.1",
"cssparser 0.1.0 (git+https://github.com/servo/rust-cssparser)",
"devtools_traits 0.0.1",
"encoding 0.2.0 (git+https://github.com/lifthrasiir/rust-encoding)",
"encoding 0.2.3 (git+https://github.com/lifthrasiir/rust-encoding)",
"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?ref=servo)",
"html5ever 0.0.0 (git+https://github.com/servo/html5ever)",
"hyper 0.0.1 (git+https://github.com/servo/hyper?ref=servo)",
"js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
"msg 0.0.1",
@ -546,9 +572,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.1.0 (git+https://github.com/servo/rust-url)",
"util 0.0.1",
"uuid 0.0.1 (git+https://github.com/rust-lang/uuid)",
"uuid 0.0.2 (git+https://github.com/rust-lang/uuid)",
]
[[package]]
@ -565,8 +592,8 @@ dependencies = [
[[package]]
name = "semver"
version = "0.1.0"
source = "git+https://github.com/rust-lang/semver#7dca047a9cd40e929a4545b37a1917daff82f156"
version = "0.1.3"
source = "git+https://github.com/rust-lang/semver#29212953f839337c672d185dde74e14b5dfb1f46"
[[package]]
name = "servo"
@ -579,6 +606,7 @@ dependencies = [
"msg 0.0.1",
"net 0.0.1",
"script 0.0.1",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"url 0.1.0 (git+https://github.com/servo/rust-url)",
"util 0.0.1",
]
@ -595,12 +623,12 @@ dependencies = [
[[package]]
name = "stb_image"
version = "0.1.0"
source = "git+https://github.com/servo/rust-stb-image#74488fef4740acf287ff5dc248d65cc74033467a"
source = "git+https://github.com/servo/rust-stb-image#97d7e440e80e41a304647363c322eab68e3700aa"
[[package]]
name = "string_cache"
version = "0.0.0"
source = "git+https://github.com/servo/string-cache#ae950525434b642eff5f4904f5e0c76cd6ea99b9"
source = "git+https://github.com/servo/string-cache#a18a432fd274e816fc41876536f70e5380abb677"
dependencies = [
"lazy_static 0.1.0 (git+https://github.com/Kimundi/lazy-static.rs)",
"phf 0.0.0 (git+https://github.com/sfackler/rust-phf)",
@ -612,7 +640,7 @@ dependencies = [
[[package]]
name = "string_cache_macros"
version = "0.0.0"
source = "git+https://github.com/servo/string-cache#ae950525434b642eff5f4904f5e0c76cd6ea99b9"
source = "git+https://github.com/servo/string-cache#a18a432fd274e816fc41876536f70e5380abb677"
dependencies = [
"lazy_static 0.1.0 (git+https://github.com/Kimundi/lazy-static.rs)",
]
@ -622,7 +650,7 @@ name = "style"
version = "0.0.1"
dependencies = [
"cssparser 0.1.0 (git+https://github.com/servo/rust-cssparser)",
"encoding 0.2.0 (git+https://github.com/lifthrasiir/rust-encoding)",
"encoding 0.2.3 (git+https://github.com/lifthrasiir/rust-encoding)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"lazy_static 0.1.0 (git+https://github.com/Kimundi/lazy-static.rs)",
"plugins 0.0.1",
@ -637,9 +665,12 @@ name = "task_info"
version = "0.0.1"
[[package]]
name = "typeable"
version = "0.0.3"
source = "git+https://github.com/reem/rust-typeable#db8975daaa3889871f67eea11baeaefd8e706eaf"
name = "time"
version = "0.1.0"
source = "git+https://github.com/rust-lang/time#afab521f3b91658a3ba2d3e877b7e01699733bef"
dependencies = [
"gcc 0.0.2 (git+https://github.com/alexcrichton/gcc-rs)",
]
[[package]]
name = "unsafe-any"
@ -649,10 +680,7 @@ source = "git+https://github.com/reem/rust-unsafe-any#2863af363bbd83079b6773920b
[[package]]
name = "url"
version = "0.1.0"
source = "git+https://github.com/servo/rust-url#8a61b7654ab5378b488225a1d8a9cbbbcbd38894"
dependencies = [
"encoding 0.2.0 (git+https://github.com/lifthrasiir/rust-encoding)",
]
source = "git+https://github.com/servo/rust-url#46458f80e48c542b2f175e36e5b7d30782ca7dc5"
[[package]]
name = "util"
@ -664,13 +692,14 @@ 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)",
"task_info 0.0.1",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"url 0.1.0 (git+https://github.com/servo/rust-url)",
]
[[package]]
name = "uuid"
version = "0.0.1"
source = "git+https://github.com/rust-lang/uuid#7c5af48d4f9074717199e05a1895f42b9fb1c1f0"
version = "0.0.2"
source = "git+https://github.com/rust-lang/uuid#f5d94d0043a615756edefaf9c6041f11e52b8370"
[[package]]
name = "xlib"
@ -680,5 +709,5 @@ source = "git+https://github.com/servo/rust-xlib#58ec3847b592aeabdcfeb6a2d02033d
[[package]]
name = "xxhash"
version = "0.0.1"
source = "git+https://github.com/Jurily/rust-xxhash#7e4174e780af0cfb29a5e53ede0b987adca16396"
source = "git+https://github.com/Jurily/rust-xxhash#64f8d02314735f511cb4272563d0f703d575c159"

16
ports/cef/browser.rs
View file

@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use browser_host::{ServoCefBrowserHost, ServoCefBrowserHostExtensions};
use core::{mod, OffScreenGlobals, OnScreenGlobals, globals};
use core::{mod, ServoCefGlobals, globals};
use eutil::Downcast;
use frame::ServoCefFrame;
use interfaces::{CefBrowser, CefBrowserHost, CefClient, CefFrame, CefRequestContext};
@ -13,7 +13,7 @@ use servo::Browser;
use types::{cef_browser_settings_t, cef_string_t, cef_window_info_t};
use window;
use compositing::windowing::{Back, Forward, NavigationWindowEvent};
use compositing::windowing::{Back, Forward, WindowEvent};
use glfw_app;
use libc::c_int;
use servo_util::opts;
@ -26,11 +26,11 @@ cef_class_impl! {
}
fn go_back(&_this) -> () {
core::send_window_event(NavigationWindowEvent(Back));
core::send_window_event(WindowEvent::Navigation(Back));
}
fn go_forward(&_this) -> () {
core::send_window_event(NavigationWindowEvent(Forward));
core::send_window_event(WindowEvent::Navigation(Forward));
}
// Returns the main (top-level) frame for the browser window.
@ -57,8 +57,8 @@ impl ServoCefBrowser {
let host = ServoCefBrowserHost::new(client.clone()).as_cef_interface();
if window_info.windowless_rendering_enabled == 0 {
let glfw_window = glfw_app::create_window();
globals.replace(Some(OnScreenGlobals(RefCell::new(glfw_window.clone()),
RefCell::new(Browser::new(Some(glfw_window))))));
globals.replace(Some(ServoCefGlobals::OnScreenGlobals(RefCell::new(glfw_window.clone()),
RefCell::new(Browser::new(Some(glfw_window))))));
}
ServoCefBrowser {
@ -80,8 +80,8 @@ impl ServoCefBrowserExtensions for CefBrowser {
let window = window::Window::new();
let servo_browser = Browser::new(Some(window.clone()));
window.set_browser(self.clone());
globals.replace(Some(OffScreenGlobals(RefCell::new(window),
RefCell::new(servo_browser))));
globals.replace(Some(ServoCefGlobals::OffScreenGlobals(RefCell::new(window),
RefCell::new(servo_browser))));
}
self.downcast().host.set_browser((*self).clone());

100
ports/cef/browser_host.rs
View file

@ -5,12 +5,10 @@
use core;
use eutil::Downcast;
use interfaces::{CefBrowser, CefBrowserHost, CefClient, cef_browser_host_t, cef_client_t};
use types::{KEYEVENT_CHAR, KEYEVENT_KEYDOWN, KEYEVENT_KEYUP, KEYEVENT_RAWKEYDOWN, cef_key_event};
use types::{cef_mouse_button_type_t, cef_mouse_event, cef_rect_t};
use types::{cef_mouse_button_type_t, cef_mouse_event, cef_rect_t, cef_key_event};
use types::cef_key_event_type_t::{KEYEVENT_CHAR, KEYEVENT_KEYDOWN, KEYEVENT_KEYUP, KEYEVENT_RAWKEYDOWN};
use compositing::windowing::{InitializeCompositingWindowEvent, KeyEvent, MouseWindowClickEvent};
use compositing::windowing::{MouseWindowEventClass, MouseWindowMouseUpEvent, PinchZoomWindowEvent};
use compositing::windowing::{ResizeWindowEvent, ScrollWindowEvent};
use compositing::windowing::{WindowEvent, KeyEvent, MouseWindowEvent};
use geom::point::TypedPoint2D;
use geom::size::TypedSize2D;
use libc::{c_double, c_int};
@ -36,7 +34,7 @@ cef_class_impl! {
.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);
core::send_window_event(ResizeWindowEvent(size));
core::send_window_event(WindowEvent::Resize(size));
core::repaint_synchronously();
}
@ -45,44 +43,44 @@ cef_class_impl! {
// Google working.
let event: &cef_key_event = event;
let key = match (*event).character as u8 {
b'a' | b'A' => constellation_msg::KeyA,
b'b' | b'B' => constellation_msg::KeyB,
b'c' | b'C' => constellation_msg::KeyC,
b'd' | b'D' => constellation_msg::KeyD,
b'e' | b'E' => constellation_msg::KeyE,
b'f' | b'F' => constellation_msg::KeyF,
b'g' | b'G' => constellation_msg::KeyG,
b'h' | b'H' => constellation_msg::KeyH,
b'i' | b'I' => constellation_msg::KeyI,
b'j' | b'J' => constellation_msg::KeyJ,
b'k' | b'K' => constellation_msg::KeyK,
b'l' | b'L' => constellation_msg::KeyL,
b'm' | b'M' => constellation_msg::KeyM,
b'n' | b'N' => constellation_msg::KeyN,
b'o' | b'O' => constellation_msg::KeyO,
b'p' | b'P' => constellation_msg::KeyP,
b'q' | b'Q' => constellation_msg::KeyQ,
b'r' | b'R' => constellation_msg::KeyR,
b's' | b'S' => constellation_msg::KeyS,
b't' | b'T' => constellation_msg::KeyT,
b'u' | b'U' => constellation_msg::KeyU,
b'v' | b'V' => constellation_msg::KeyV,
b'w' | b'W' => constellation_msg::KeyW,
b'x' | b'X' => constellation_msg::KeyX,
b'y' | b'Y' => constellation_msg::KeyY,
b'z' | b'Z' => constellation_msg::KeyZ,
b'0' => constellation_msg::Key0,
b'1' => constellation_msg::Key1,
b'2' => constellation_msg::Key2,
b'3' => constellation_msg::Key3,
b'4' => constellation_msg::Key4,
b'5' => constellation_msg::Key5,
b'6' => constellation_msg::Key6,
b'7' => constellation_msg::Key7,
b'8' => constellation_msg::Key8,
b'9' => constellation_msg::Key9,
b'\n' | b'\r' => constellation_msg::KeyEnter,
_ => constellation_msg::KeySpace,
b'a' | b'A' => constellation_msg::Key::A,
b'b' | b'B' => constellation_msg::Key::B,
b'c' | b'C' => constellation_msg::Key::C,
b'd' | b'D' => constellation_msg::Key::D,
b'e' | b'E' => constellation_msg::Key::E,
b'f' | b'F' => constellation_msg::Key::F,
b'g' | b'G' => constellation_msg::Key::G,
b'h' | b'H' => constellation_msg::Key::H,
b'i' | b'I' => constellation_msg::Key::I,
b'j' | b'J' => constellation_msg::Key::J,
b'k' | b'K' => constellation_msg::Key::K,
b'l' | b'L' => constellation_msg::Key::L,
b'm' | b'M' => constellation_msg::Key::M,
b'n' | b'N' => constellation_msg::Key::N,
b'o' | b'O' => constellation_msg::Key::O,
b'p' | b'P' => constellation_msg::Key::P,
b'q' | b'Q' => constellation_msg::Key::Q,
b'r' | b'R' => constellation_msg::Key::R,
b's' | b'S' => constellation_msg::Key::S,
b't' | b'T' => constellation_msg::Key::T,
b'u' | b'U' => constellation_msg::Key::U,
b'v' | b'V' => constellation_msg::Key::V,
b'w' | b'W' => constellation_msg::Key::W,
b'x' | b'X' => constellation_msg::Key::X,
b'y' | b'Y' => constellation_msg::Key::Y,
b'z' | b'Z' => constellation_msg::Key::Z,
b'0' => constellation_msg::Key::Num0,
b'1' => constellation_msg::Key::Num1,
b'2' => constellation_msg::Key::Num2,
b'3' => constellation_msg::Key::Num3,
b'4' => constellation_msg::Key::Num4,
b'5' => constellation_msg::Key::Num5,
b'6' => constellation_msg::Key::Num6,
b'7' => constellation_msg::Key::Num7,
b'8' => constellation_msg::Key::Num8,
b'9' => constellation_msg::Key::Num9,
b'\n' | b'\r' => constellation_msg::Key::Enter,
_ => constellation_msg::Key::Space,
};
let key_state = match (*event).t {
KEYEVENT_RAWKEYDOWN => Pressed,
@ -103,11 +101,11 @@ cef_class_impl! {
let button_type = mouse_button_type as uint;
let point = TypedPoint2D((*event).x as f32, (*event).y as f32);
if mouse_up != 0 {
core::send_window_event(MouseWindowEventClass(MouseWindowClickEvent(button_type,
point)))
core::send_window_event(WindowEvent::MouseWindowEventClass(
MouseWindowEvent::MouseWindowClickEvent(button_type, point)))
} else {
core::send_window_event(MouseWindowEventClass(MouseWindowMouseUpEvent(button_type,
point)))
core::send_window_event(WindowEvent::MouseWindowEventClass(
MouseWindowEvent::MouseWindowMouseUpEvent(button_type, point)))
}
}
@ -119,7 +117,7 @@ cef_class_impl! {
let event: &cef_mouse_event = event;
let delta = TypedPoint2D(delta_x as f32, delta_y as f32);
let origin = TypedPoint2D((*event).x as i32, (*event).y as i32);
core::send_window_event(ScrollWindowEvent(delta, origin))
core::send_window_event(WindowEvent::Scroll(delta, origin))
}
fn get_zoom_level(&_this) -> c_double {
@ -128,11 +126,11 @@ cef_class_impl! {
fn set_zoom_level(&this, new_zoom_level: c_double) -> () {
let old_zoom_level = this.get_zoom_level();
core::send_window_event(PinchZoomWindowEvent((new_zoom_level / old_zoom_level) as f32))
core::send_window_event(WindowEvent::PinchZoom((new_zoom_level / old_zoom_level) as f32))
}
fn initialize_compositing(&_this) -> () {
core::send_window_event(InitializeCompositingWindowEvent);
core::send_window_event(WindowEvent::InitializeCompositing);
}
}
}

16
ports/cef/core.rs
View file

@ -7,7 +7,7 @@ use interfaces::cef_app_t;
use types::{cef_main_args_t, cef_settings_t};
use window;
use compositing::windowing::{IdleWindowEvent, WindowEvent};
use compositing::windowing::WindowEvent;
use geom::size::TypedSize2D;
use glfw_app;
use libc::{c_char, c_int, c_void};
@ -141,10 +141,10 @@ pub extern "C" fn cef_run_message_loop() {
let mut the_globals = globals.get();
let the_globals = the_globals.as_mut().unwrap();
match **the_globals {
OnScreenGlobals(ref window, ref browser) => {
ServoCefGlobals::OnScreenGlobals(ref window, ref browser) => {
while browser.borrow_mut().handle_event(window.borrow_mut().wait_events()) {}
}
OffScreenGlobals(ref window, ref browser) => {
ServoCefGlobals::OffScreenGlobals(ref window, ref browser) => {
while browser.borrow_mut().handle_event(window.borrow_mut().wait_events()) {}
}
}
@ -152,7 +152,7 @@ pub extern "C" fn cef_run_message_loop() {
#[no_mangle]
pub extern "C" fn cef_do_message_loop_work() {
send_window_event(IdleWindowEvent)
send_window_event(WindowEvent::Idle)
}
#[no_mangle]
@ -177,7 +177,7 @@ pub fn send_window_event(event: WindowEvent) {
};
loop {
match **the_globals {
OnScreenGlobals(_, ref browser) => {
ServoCefGlobals::OnScreenGlobals(_, ref browser) => {
match browser.try_borrow_mut() {
None => {
// We're trying to send an event while processing another one. This will
@ -198,7 +198,7 @@ pub fn send_window_event(event: WindowEvent) {
}
}
}
OffScreenGlobals(_, ref browser) => {
ServoCefGlobals::OffScreenGlobals(_, ref browser) => {
match browser.try_borrow_mut() {
None => {
// We're trying to send an event while processing another one. This will
@ -233,8 +233,8 @@ macro_rules! browser_method_delegate(
Some(the_globals) => the_globals,
};
match **the_globals {
OnScreenGlobals(_, ref browser) => browser.borrow_mut().$method(),
OffScreenGlobals(_, ref browser) => browser.borrow_mut().$method(),
ServoCefGlobals::OnScreenGlobals(_, ref browser) => browser.borrow_mut().$method(),
ServoCefGlobals::OffScreenGlobals(_, ref browser) => browser.borrow_mut().$method(),
}
}
)*

4
ports/cef/frame.rs
View file

@ -7,7 +7,7 @@ use interfaces::{CefFrame, CefStringVisitor, cef_frame_t, cef_string_visitor_t};
use types::{cef_string_t, cef_string_userfree_t};
use core;
use compositing::windowing::LoadUrlWindowEvent;
use compositing::windowing::WindowEvent;
use std::cell::RefCell;
pub struct ServoCefFrame {
@ -29,7 +29,7 @@ cef_class_impl! {
fn load_url(&this, url: *const cef_string_t) -> () {
let this = this.downcast();
*this.url.borrow_mut() = String::from_utf16(url).unwrap();
core::send_window_event(LoadUrlWindowEvent(String::from_utf16(url).unwrap()));
core::send_window_event(WindowEvent::LoadUrl(String::from_utf16(url).unwrap()));
}
fn get_url(&this) -> cef_string_userfree_t {
let this = this.downcast();

2
ports/cef/render_handler.rs
View file

@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use interfaces::{CefBrowser, CefRenderHandler};
use types::PET_VIEW;
use types::cef_paint_element_type_t::PET_VIEW;
use std::ptr;

4
ports/cef/window.rs
View file

@ -14,7 +14,7 @@ use types::cef_rect_t;
use wrappers::Utf16Encoder;
use compositing::compositor_task::{mod, CompositorProxy, CompositorReceiver};
use compositing::windowing::{IdleWindowEvent, WindowEvent, WindowMethods};
use compositing::windowing::{WindowEvent, WindowMethods};
use geom::scale_factor::ScaleFactor;
use geom::size::TypedSize2D;
use gleam::gl;
@ -85,7 +85,7 @@ impl Window {
/// Currently unimplemented.
pub fn wait_events(&self) -> WindowEvent {
IdleWindowEvent
WindowEvent::Idle
}
}

3
ports/glfw/Cargo.toml
View file

@ -31,3 +31,6 @@ git = "https://github.com/servo/rust-cgl"
[dependencies.gleam]
git = "https://github.com/servo/gleam"
[dependencies.time]
git = "https://github.com/rust-lang/time"

305
ports/glfw/window.rs
View file

@ -8,12 +8,12 @@ use NestedEventLoopListener;
use compositing::compositor_task::{mod, CompositorProxy, CompositorReceiver};
use compositing::windowing::{Forward, Back};
use compositing::windowing::{IdleWindowEvent, ResizeWindowEvent};
use compositing::windowing::{Idle, Resize};
use compositing::windowing::{KeyEvent, MouseWindowClickEvent, MouseWindowMouseDownEvent};
use compositing::windowing::{MouseWindowEventClass, MouseWindowMoveEventClass};
use compositing::windowing::{MouseWindowMouseUpEvent, RefreshWindowEvent};
use compositing::windowing::{NavigationWindowEvent, ScrollWindowEvent, ZoomWindowEvent};
use compositing::windowing::{PinchZoomWindowEvent, QuitWindowEvent};
use compositing::windowing::{MouseWindowMouseUpEvent, Refresh};
use compositing::windowing::{Navigation, Scroll, Zoom};
use compositing::windowing::{PinchZoom, Quit};
use compositing::windowing::{WindowEvent, WindowMethods};
use geom::point::{Point2D, TypedPoint2D};
use geom::scale_factor::ScaleFactor;
@ -26,9 +26,10 @@ use libc::c_int;
use msg::compositor_msg::{Blank, FinishedLoading, IdlePaintState, Loading, PaintState};
use msg::compositor_msg::{PaintingPaintState, PerformingLayout, ReadyState};
use msg::constellation_msg::{mod, LoadData};
use msg::constellation_msg::{Key, KeyModifiers, KeyEscape, KeyEqual, KeyMinus, KeyBackspace, KeyPageUp, KeyPageDown, CONTROL, SHIFT};
use msg::constellation_msg::{Key, KeyModifiers, CONTROL, SHIFT};
use std::cell::{Cell, RefCell};
use std::comm::Receiver;
use std::num::Float;
use std::rc::Rc;
use time::{mod, Timespec};
use util::geometry::ScreenPx;
@ -120,9 +121,9 @@ impl Window {
}
if self.glfw_window.should_close() {
QuitWindowEvent
Quit
} else {
self.event_queue.borrow_mut().remove(0).unwrap_or(IdleWindowEvent)
self.event_queue.borrow_mut().remove(0).unwrap_or(Idle)
}
}
@ -211,24 +212,24 @@ impl WindowMethods for Window {
/// Helper function to handle keyboard events.
fn handle_key(&self, key: Key, mods: KeyModifiers) {
match key {
KeyEscape => self.glfw_window.set_should_close(true),
KeyEqual if mods.contains(CONTROL) => { // Ctrl-+
self.event_queue.borrow_mut().push(ZoomWindowEvent(1.1));
Key::Escape => self.glfw_window.set_should_close(true),
Key::Equal if mods.contains(CONTROL) => { // Ctrl-+
self.event_queue.borrow_mut().push(Zoom(1.1));
}
KeyMinus if mods.contains(CONTROL) => { // Ctrl--
self.event_queue.borrow_mut().push(ZoomWindowEvent(1.0/1.1));
Key::Minus if mods.contains(CONTROL) => { // Ctrl--
self.event_queue.borrow_mut().push(Zoom(1.0/1.1));
}
KeyBackspace if mods.contains(SHIFT) => { // Shift-Backspace
self.event_queue.borrow_mut().push(NavigationWindowEvent(Forward));
Key::Backspace if mods.contains(SHIFT) => { // Shift-Backspace
self.event_queue.borrow_mut().push(Navigation(Forward));
}
KeyBackspace => { // Backspace
self.event_queue.borrow_mut().push(NavigationWindowEvent(Back));
Key::Backspace => { // Backspace
self.event_queue.borrow_mut().push(Navigation(Back));
}
KeyPageDown => {
Key::PageDown => {
let (_, height) = self.glfw_window.get_size();
self.scroll_window(0.0, -height as f32);
}
KeyPageUp => {
Key::PageUp => {
let (_, height) = self.glfw_window.get_size();
self.scroll_window(0.0, height as f32);
}
@ -262,10 +263,10 @@ impl Window {
},
glfw::FramebufferSizeEvent(width, height) => {
self.event_queue.borrow_mut().push(
ResizeWindowEvent(TypedSize2D(width as uint, height as uint)));
Resize(TypedSize2D(width as uint, height as uint)));
},
glfw::RefreshEvent => {
self.event_queue.borrow_mut().push(RefreshWindowEvent);
self.event_queue.borrow_mut().push(Refresh);
},
glfw::MouseButtonEvent(button, action, _mods) => {
let (x, y) = window.get_cursor_pos();
@ -277,11 +278,11 @@ impl Window {
let y = y as f32 * hidpi;
match button {
glfw::MouseButton5 => { // Back button (might be different per platform)
self.event_queue.borrow_mut().push(NavigationWindowEvent(Back));
glfw::MouseButton::Button5 => { // Back button (might be different per platform)
self.event_queue.borrow_mut().push(Navigation(Back));
},
glfw::MouseButton6 => { // Forward
self.event_queue.borrow_mut().push(NavigationWindowEvent(Forward));
glfw::MouseButton::Button6 => { // Forward
self.event_queue.borrow_mut().push(Navigation(Forward));
},
glfw::MouseButtonLeft | glfw::MouseButtonRight => {
self.handle_mouse(button, action, x as i32, y as i32);
@ -294,14 +295,14 @@ impl Window {
MouseWindowMoveEventClass(TypedPoint2D(xpos as f32, ypos as f32)));
},
glfw::ScrollEvent(xpos, ypos) => {
match (window.get_key(glfw::KeyLeftControl),
window.get_key(glfw::KeyRightControl)) {
match (window.get_key(glfw::Key::LeftControl),
window.get_key(glfw::Key::RightControl)) {
(glfw::Press, _) | (_, glfw::Press) => {
// Ctrl-Scrollwheel simulates a "pinch zoom" gesture.
if ypos < 0.0 {
self.event_queue.borrow_mut().push(PinchZoomWindowEvent(1.0/1.1));
self.event_queue.borrow_mut().push(PinchZoom(1.0/1.1));
} else if ypos > 0.0 {
self.event_queue.borrow_mut().push(PinchZoomWindowEvent(1.1));
self.event_queue.borrow_mut().push(PinchZoom(1.1));
}
},
_ => {
@ -325,7 +326,7 @@ impl Window {
let x = x as f32 * hidpi;
let y = y as f32 * hidpi;
self.event_queue.borrow_mut().push(ScrollWindowEvent(TypedPoint2D(dx, dy),
self.event_queue.borrow_mut().push(Scroll(TypedPoint2D(dx, dy),
TypedPoint2D(x as i32, y as i32)));
}
@ -416,7 +417,7 @@ extern "C" fn on_refresh(_glfw_window: *mut glfw::ffi::GLFWwindow) {
match g_nested_event_loop_listener {
None => {}
Some(listener) => {
(*listener).handle_event_from_nested_event_loop(RefreshWindowEvent);
(*listener).handle_event_from_nested_event_loop(Refresh);
}
}
}
@ -430,7 +431,7 @@ extern "C" fn on_framebuffer_size(_glfw_window: *mut glfw::ffi::GLFWwindow,
None => {}
Some(listener) => {
let size = TypedSize2D(width as uint, height as uint);
(*listener).handle_event_from_nested_event_loop(ResizeWindowEvent(size));
(*listener).handle_event_from_nested_event_loop(Resize(size));
}
}
}
@ -456,132 +457,132 @@ fn glfw_mods_to_script_mods(mods: glfw::Modifiers) -> constellation_msg::KeyModi
macro_rules! glfw_keys_to_script_keys(
($key:expr, $($name:ident),+) => (
match $key {
$(glfw::$name => constellation_msg::$name,)+
$(glfw::Key::$name => constellation_msg::Key::$name,)+
}
);
)
fn glfw_key_to_script_key(key: glfw::Key) -> constellation_msg::Key {
glfw_keys_to_script_keys!(key,
KeySpace,
KeyApostrophe,
KeyComma,
KeyMinus,
KeyPeriod,
KeySlash,
Key0,
Key1,
Key2,
Key3,
Key4,
Key5,
Key6,
Key7,
Key8,
Key9,
KeySemicolon,
KeyEqual,
KeyA,
KeyB,
KeyC,
KeyD,
KeyE,
KeyF,
KeyG,
KeyH,
KeyI,
KeyJ,
KeyK,
KeyL,
KeyM,
KeyN,
KeyO,
KeyP,
KeyQ,
KeyR,
KeyS,
KeyT,
KeyU,
KeyV,
KeyW,
KeyX,
KeyY,
KeyZ,
KeyLeftBracket,
KeyBackslash,
KeyRightBracket,
KeyGraveAccent,
KeyWorld1,
KeyWorld2,
Space,
Apostrophe,
Comma,
Minus,
Period,
Slash,
Num0,
Num1,
Num2,
Num3,
Num4,
Num5,
Num6,
Num7,
Num8,
Num9,
Semicolon,
Equal,
A,
B,
C,
D,
E,
F,
G,
H,
I,
J,
K,
L,
M,
N,
O,
P,
Q,
R,
S,
T,
U,
V,
W,
X,
Y,
Z,
LeftBracket,
Backslash,
RightBracket,
GraveAccent,
World1,
World2,
KeyEscape,
KeyEnter,
KeyTab,
KeyBackspace,
KeyInsert,
KeyDelete,
KeyRight,
KeyLeft,
KeyDown,
KeyUp,
KeyPageUp,
KeyPageDown,
KeyHome,
KeyEnd,
KeyCapsLock,
KeyScrollLock,
KeyNumLock,
KeyPrintScreen,
KeyPause,
KeyF1,
KeyF2,
KeyF3,
KeyF4,
KeyF5,
KeyF6,
KeyF7,
KeyF8,
KeyF9,
KeyF10,
KeyF11,
KeyF12,
KeyF13,
KeyF14,
KeyF15,
KeyF16,
KeyF17,
KeyF18,
KeyF19,
KeyF20,
KeyF21,
KeyF22,
KeyF23,
KeyF24,
KeyF25,
KeyKp0,
KeyKp1,
KeyKp2,
KeyKp3,
KeyKp4,
KeyKp5,
KeyKp6,
KeyKp7,
KeyKp8,
KeyKp9,
KeyKpDecimal,
KeyKpDivide,
KeyKpMultiply,
KeyKpSubtract,
KeyKpAdd,
KeyKpEnter,
KeyKpEqual,
KeyLeftShift,
KeyLeftControl,
KeyLeftAlt,
KeyLeftSuper,
KeyRightShift,
KeyRightControl,
KeyRightAlt,
KeyRightSuper,
KeyMenu)
Escape,
Enter,
Tab,
Backspace,
Insert,
Delete,
Right,
Left,
Down,
Up,
PageUp,
PageDown,
Home,
End,
CapsLock,
ScrollLock,
NumLock,
PrintScreen,
Pause,
F1,
F2,
F3,
F4,
F5,
F6,
F7,
F8,
F9,
F10,
F11,
F12,
F13,
F14,
F15,
F16,
F17,
F18,
F19,
F20,
F21,
F22,
F23,
F24,
F25,
Kp0,
Kp1,
Kp2,
Kp3,
Kp4,
Kp5,
Kp6,
Kp7,
Kp8,
Kp9,
KpDecimal,
KpDivide,
KpMultiply,
KpSubtract,
KpAdd,
KpEnter,
KpEqual,
LeftShift,
LeftControl,
LeftAlt,
LeftSuper,
RightShift,
RightControl,
RightAlt,
RightSuper,
Menu)
}

3
ports/glutin/Cargo.toml
View file

@ -31,3 +31,6 @@ git = "https://github.com/servo/gleam"
[dependencies.cgl]
git = "https://github.com/servo/rust-cgl"
[dependencies.time]
git = "https://github.com/rust-lang/time"

39
ports/gonk/Cargo.lock generated
View file

@ -9,6 +9,7 @@ dependencies = [
"msg 0.0.1",
"script 0.0.1",
"servo 0.0.1",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"util 0.0.1",
]
@ -63,6 +64,7 @@ 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.1.0 (git+https://github.com/servo/rust-url)",
"util 0.0.1",
]
@ -70,9 +72,10 @@ dependencies = [
[[package]]
name = "cookie"
version = "0.0.1"
source = "git+https://github.com/servo/cookie-rs#30520767a95b92e39265aaf6822db515b2418f1d"
source = "git+https://github.com/servo/cookie-rs#f82090b19c2738b90528167ef873d8eac0353294"
dependencies = [
"openssl 0.0.1 (git+https://github.com/servo/rust-openssl)",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"url 0.1.0 (git+https://github.com/servo/rust-url)",
]
@ -101,7 +104,7 @@ dependencies = [
[[package]]
name = "cssparser"
version = "0.1.0"
source = "git+https://github.com/servo/rust-cssparser#3f98f1308b769b5d61efc6c133ac520df2b074ac"
source = "git+https://github.com/servo/rust-cssparser#97d8c3b20a240881573748d4eadcda610bfb888c"
dependencies = [
"encoding 0.2.0 (git+https://github.com/lifthrasiir/rust-encoding)",
]
@ -196,6 +199,11 @@ name = "freetype-sys"
version = "2.4.11"
source = "git+https://github.com/servo/libfreetype2#5b6499164106f094937565595c7b96d07de55521"
[[package]]
name = "gcc"
version = "0.1.1"
source = "git+https://github.com/alexcrichton/gcc-rs#d35c34c871dd75f97fadf04cb0ed85d997a9bc0c"
[[package]]
name = "geom"
version = "0.1.0"
@ -221,6 +229,7 @@ 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.1.0 (git+https://github.com/servo/rust-url)",
"util 0.0.1",
]
@ -264,19 +273,20 @@ source = "git+https://github.com/servo/rust-harfbuzz#8aab215463214647b7a81f66011
[[package]]
name = "html5ever"
version = "0.0.0"
source = "git+https://github.com/servo/html5ever?ref=servo#87c7e8b710391338b2463652be835f498923653c"
source = "git+https://github.com/servo/html5ever#e6f8d83de9fffe63a825d95d957ba6bcbc3e1632"
dependencies = [
"html5ever_macros 0.0.0 (git+https://github.com/servo/html5ever?ref=servo)",
"html5ever_macros 0.0.0 (git+https://github.com/servo/html5ever)",
"phf 0.0.0 (git+https://github.com/sfackler/rust-phf)",
"phf_mac 0.0.0 (git+https://github.com/sfackler/rust-phf)",
"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)",
]
[[package]]
name = "html5ever_macros"
version = "0.0.0"
source = "git+https://github.com/servo/html5ever?ref=servo#87c7e8b710391338b2463652be835f498923653c"
source = "git+https://github.com/servo/html5ever#e6f8d83de9fffe63a825d95d957ba6bcbc3e1632"
[[package]]
name = "hyper"
@ -412,6 +422,7 @@ dependencies = [
"hyper 0.0.1 (git+https://github.com/servo/hyper?ref=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.1.0 (git+https://github.com/servo/rust-url)",
"util 0.0.1",
]
@ -491,7 +502,7 @@ dependencies = [
"encoding 0.2.0 (git+https://github.com/lifthrasiir/rust-encoding)",
"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?ref=servo)",
"html5ever 0.0.0 (git+https://github.com/servo/html5ever)",
"hyper 0.0.1 (git+https://github.com/servo/hyper?ref=servo)",
"js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
"msg 0.0.1",
@ -501,6 +512,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",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"url 0.1.0 (git+https://github.com/servo/rust-url)",
"util 0.0.1",
"uuid 0.0.1 (git+https://github.com/rust-lang/uuid)",
@ -528,6 +540,7 @@ dependencies = [
"msg 0.0.1",
"net 0.0.1",
"script 0.0.1",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"url 0.1.0 (git+https://github.com/servo/rust-url)",
"util 0.0.1",
]
@ -585,6 +598,14 @@ dependencies = [
name = "task_info"
version = "0.0.1"
[[package]]
name = "time"
version = "0.1.0"
source = "git+https://github.com/rust-lang/time#afab521f3b91658a3ba2d3e877b7e01699733bef"
dependencies = [
"gcc 0.1.1 (git+https://github.com/alexcrichton/gcc-rs)",
]
[[package]]
name = "typeable"
version = "0.0.3"
@ -598,10 +619,7 @@ source = "git+https://github.com/reem/rust-unsafe-any#eb3fe87bea85f375b8fcefa0cd
[[package]]
name = "url"
version = "0.1.0"
source = "git+https://github.com/servo/rust-url#8a61b7654ab5378b488225a1d8a9cbbbcbd38894"
dependencies = [
"encoding 0.2.0 (git+https://github.com/lifthrasiir/rust-encoding)",
]
source = "git+https://github.com/servo/rust-url#46458f80e48c542b2f175e36e5b7d30782ca7dc5"
[[package]]
name = "util"
@ -613,6 +631,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)",
"task_info 0.0.1",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"url 0.1.0 (git+https://github.com/servo/rust-url)",
]

3
ports/gonk/Cargo.toml
View file

@ -29,3 +29,6 @@ path = "../../components/util"
[dependencies.egl]
git = "https://github.com/servo/rust-egl"
[dependencies.time]
git = "https://github.com/rust-lang/time"