diff options
27 files changed, 522 insertions, 260 deletions
diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml index 9342b7fa60d..37276b5baf0 100644 --- a/components/canvas/Cargo.toml +++ b/components/canvas/Cargo.toml @@ -9,9 +9,11 @@ path = "lib.rs" [dependencies.azure] git = "https://github.com/servo/rust-azure" +features = ["plugins"] [dependencies.layers] git = "https://github.com/servo/rust-layers" +features = ["plugins"] [dependencies.canvas_traits] path = "../canvas_traits" @@ -40,4 +42,4 @@ features = [ "serde-serialization" ] log = "0.3" num = "0.1.24" gleam = "0.1" -euclid = "0.2" +euclid = {version = "0.3", features = ["plugins"]} diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml index da818557264..cd854a761b9 100644 --- a/components/canvas_traits/Cargo.toml +++ b/components/canvas_traits/Cargo.toml @@ -12,9 +12,11 @@ path = "../gfx_traits" [dependencies.azure] git = "https://github.com/servo/rust-azure" +features = ["plugins"] [dependencies.layers] git = "https://github.com/servo/rust-layers" +features = ["plugins"] [dependencies.offscreen_gl_context] git = "https://github.com/ecoal95/rust-offscreen-rendering-context" @@ -37,6 +39,6 @@ path = "../plugins" path = "../util" [dependencies] -euclid = "0.2" -serde_macros = "0.5" +euclid = {version = "0.3", features = ["plugins"]} +serde_macros = "0.6" diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml index 3866bdaf26f..95ddbc9cfc7 100644 --- a/components/compositing/Cargo.toml +++ b/components/compositing/Cargo.toml @@ -48,9 +48,11 @@ path = "../plugins" [dependencies.azure] git = "https://github.com/servo/rust-azure" +features = ["plugins"] [dependencies.layers] git = "https://github.com/servo/rust-layers" +features = ["plugins"] [dependencies.clipboard] git = "https://github.com/aweinstock314/rust-clipboard" @@ -67,13 +69,13 @@ version = "0.2" features = [ "serde_serialization" ] [dependencies] -app_units = "0.1" +app_units = {version = "0.1", features = ["plugins"]} image = "0.4.0" log = "0.3" num = "0.1.24" time = "0.1.17" gleam = "0.1" -euclid = "0.2" +euclid = {version = "0.3", features = ["plugins"]} [target.x86_64-apple-darwin.dependencies] core-graphics = "0.1" diff --git a/components/devtools/Cargo.toml b/components/devtools/Cargo.toml index 45b759173ee..ffff267e735 100644 --- a/components/devtools/Cargo.toml +++ b/components/devtools/Cargo.toml @@ -35,5 +35,5 @@ log = "0.3" time = "0.1" rustc-serialize = "0.3" serde = "0.6" -serde_macros = "0.5" +serde_macros = "0.6" diff --git a/components/devtools_traits/Cargo.toml b/components/devtools_traits/Cargo.toml index be9ddcaa25b..bf2ea4b204b 100644 --- a/components/devtools_traits/Cargo.toml +++ b/components/devtools_traits/Cargo.toml @@ -32,5 +32,5 @@ time = "0.1" rustc-serialize = "0.3" bitflags = "0.3" serde = "0.6" -serde_macros = "0.5" +serde_macros = "0.6" diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index 204386757db..bc5c98a8cd3 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -9,9 +9,9 @@ name = "gfx" path = "lib.rs" [dependencies] -app_units = "0.1" +app_units = {version = "0.1", features = ["plugins"]} bitflags = "0.3" -euclid = "0.2" +euclid = {version = "0.3", features = ["plugins"]} fnv = "1.0" harfbuzz-sys = "0.1" lazy_static = "0.1" @@ -20,7 +20,7 @@ log = "0.3" rand = "0.3" rustc-serialize = "0.3" serde = "0.6" -serde_macros = "0.5" +serde_macros = "0.6" smallvec = "0.1" string_cache = "0.1" time = "0.1.12" @@ -52,9 +52,11 @@ path = "../style" [dependencies.azure] git = "https://github.com/servo/rust-azure" +features = ["plugins"] [dependencies.layers] git = "https://github.com/servo/rust-layers" +features = ["plugins"] [dependencies.skia] git = "https://github.com/servo/skia" diff --git a/components/gfx_traits/Cargo.toml b/components/gfx_traits/Cargo.toml index 913e973d163..a092e9f0ddf 100644 --- a/components/gfx_traits/Cargo.toml +++ b/components/gfx_traits/Cargo.toml @@ -9,3 +9,4 @@ path = "lib.rs" [dependencies.azure] git = "https://github.com/servo/rust-azure" +features = ["plugins"] diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index 9856c81b27b..10af4f1566d 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -9,6 +9,7 @@ path = "lib.rs" [dependencies.azure] git = "https://github.com/servo/rust-azure" +features = ["plugins"] [dependencies.canvas] path = "../canvas" @@ -67,7 +68,7 @@ version = "0.2" features = [ "serde_serialization" ] [dependencies] -app_units = "0.1" +app_units = {version = "0.1", features = ["plugins"]} log = "0.3" encoding = "0.2" fnv = "1.0" @@ -77,9 +78,9 @@ libc = "0.1" smallvec = "0.1" string_cache = "0.1" string_cache_plugin = "0.1" -euclid = "0.2" +euclid = {version = "0.3", features = ["plugins"]} serde = "0.6" -serde_macros = "0.5" +serde_macros = "0.6" serde_json = "0.5" unicode-bidi = "0.2" unicode-script = { version = "0.1", features = ["harfbuzz"] } diff --git a/components/layout_traits/Cargo.toml b/components/layout_traits/Cargo.toml index 2a8141e3c2d..8295addcc35 100644 --- a/components/layout_traits/Cargo.toml +++ b/components/layout_traits/Cargo.toml @@ -33,7 +33,7 @@ version = "0.2" features = [ "serde_serialization" ] [dependencies] -euclid = "0.2" +euclid = {version = "0.3", features = ["plugins"]} serde = "0.6" -serde_macros = "0.5" +serde_macros = "0.6" diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml index 6a67a0bc53e..8412163ff4c 100644 --- a/components/msg/Cargo.toml +++ b/components/msg/Cargo.toml @@ -18,9 +18,11 @@ path = "../style_traits" [dependencies.azure] git = "https://github.com/servo/rust-azure" +features = ["plugins"] [dependencies.layers] git = "https://github.com/servo/rust-layers" +features = ["plugins"] [dependencies.hyper] version = "0.6" @@ -41,12 +43,12 @@ features = ["texture_surface"] path = "../plugins" [dependencies] -app_units = "0.1" +app_units = {version = "0.1", features = ["plugins"]} bitflags = "0.3" rustc-serialize = "0.3.4" -euclid = "0.2" +euclid = {version = "0.3", features = ["plugins"]} serde = "0.6" -serde_macros = "0.5" +serde_macros = "0.6" [target.x86_64-apple-darwin.dependencies] core-foundation = "0.1" diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index 5ffec7acda7..51573136d4e 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -40,4 +40,4 @@ regex = "0.1.14" regex_macros = "0.1.8" flate2 = "0.2.0" uuid = "0.1.16" -euclid = "0.2" +euclid = {version = "0.3", features = ["plugins"]} diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml index a46d6481132..1ab4fe2e341 100644 --- a/components/net_traits/Cargo.toml +++ b/components/net_traits/Cargo.toml @@ -32,9 +32,9 @@ path = "../plugins" [dependencies] log = "0.3" -euclid = "0.2" +euclid = {version = "0.3", features = ["plugins"]} image = "0.4.0" regex = "0.1.33" regex_macros = "0.1.19" serde = "0.6" -serde_macros = "0.5" +serde_macros = "0.6" diff --git a/components/profile_traits/Cargo.toml b/components/profile_traits/Cargo.toml index 0f993d3dcd5..72c97f7f63e 100644 --- a/components/profile_traits/Cargo.toml +++ b/components/profile_traits/Cargo.toml @@ -31,5 +31,5 @@ path = "../plugins" [dependencies] serde = "0.6" -serde_macros = "0.5" +serde_macros = "0.6" time = "0.1.12" diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 0f8913f8c00..72992af9e8b 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -71,7 +71,7 @@ version = "0.6" features = [ "serde-serialization" ] [dependencies] -app_units = "0.1" +app_units = {version = "0.1", features = ["plugins"]} log = "0.3" encoding = "0.2" fnv = "1.0" @@ -87,7 +87,7 @@ smallvec = "0.1" html5ever = { version = "0.2.1", features = ["unstable"] } string_cache = { version = "0.1.15", features = ["unstable"] } string_cache_plugin = "0.1" -euclid = "0.2" +euclid = {version = "0.3", features = ["plugins"]} tendril = "0.1.1" rand = "0.3" serde = "0.6" diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml index 11e3b077096..357335bcf17 100644 --- a/components/script_traits/Cargo.toml +++ b/components/script_traits/Cargo.toml @@ -33,9 +33,9 @@ version = "0.2" features = [ "serde_serialization" ] [dependencies] -app_units = "0.1" +app_units = {version = "0.1", features = ["plugins"]} libc = "0.1" -euclid = "0.2" +euclid = {version = "0.3", features = ["plugins"]} serde = "0.6" -serde_macros = "0.5" +serde_macros = "0.6" time = "0.1.12" diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 0a67dc614c1..7d26d740f63 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -10,7 +10,7 @@ dependencies = [ "devtools 0.0.1", "devtools_traits 0.0.1", "env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gfx_tests 0.0.1", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -73,13 +73,13 @@ dependencies = [ [[package]] name = "app_units" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -89,21 +89,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "azure" -version = "0.1.0" -source = "git+https://github.com/servo/rust-azure#cf625c81bcbc412e3d79303a35fe7828e3fc615d" +version = "0.2.0" +source = "git+https://github.com/servo/rust-azure#5a5701c269cb7cb65f6c690122ef75c268f8d44d" dependencies = [ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)", "egl 0.1.0 (git+https://github.com/servo/rust-egl)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)", "heapsize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "skia 0.0.20130412 (git+https://github.com/servo/skia)", "x11 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -146,10 +146,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "canvas" version = "0.0.1" dependencies = [ - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "canvas_traits 0.0.1", "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", @@ -165,16 +165,16 @@ dependencies = [ name = "canvas_traits" version = "0.0.1" dependencies = [ - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)", "plugins 0.0.1", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -248,15 +248,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "compositing" version = "0.0.1" dependencies = [ - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "canvas 0.0.1", "canvas_traits 0.0.1", "clipboard 0.0.3 (git+https://github.com/aweinstock314/rust-clipboard)", "core-graphics 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)", "devtools_traits 0.0.1", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gfx_traits 0.0.1", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -324,7 +324,7 @@ dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -352,7 +352,7 @@ dependencies = [ "plugins 0.0.1", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -369,7 +369,7 @@ dependencies = [ "plugins 0.0.1", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -518,15 +518,17 @@ dependencies = [ [[package]] name = "euclid" -version = "0.2.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "heapsize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_plugin 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -621,14 +623,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "gfx" version = "0.0.1" dependencies = [ - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "fontconfig 0.1.0 (git+https://github.com/servo/rust-fontconfig)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", @@ -647,7 +649,7 @@ dependencies = [ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "simd 0.1.0 (git+https://github.com/huonw/simd)", "skia 0.0.20130412 (git+https://github.com/servo/skia)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -670,7 +672,7 @@ dependencies = [ name = "gfx_traits" version = "0.0.1" dependencies = [ - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", ] [[package]] @@ -748,6 +750,36 @@ dependencies = [ ] [[package]] +name = "glutin" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "android_glue 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cocoa 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_common 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kernel32-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "khronos_api 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "objc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "osmesa-sys 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "shared_library 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "user32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-kbd 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-window 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "x11-dl 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "glutin_app" version = "0.0.1" dependencies = [ @@ -755,7 +787,7 @@ dependencies = [ "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "compositing 0.0.1", "egl 0.1.0 (git+https://github.com/servo/rust-egl)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "glutin 0.4.0 (git+https://github.com/servo/glutin?branch=servo)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", @@ -905,12 +937,12 @@ dependencies = [ [[package]] name = "io-surface" -version = "0.1.0" -source = "git+https://github.com/servo/io-surface-rs#c558d64ea5cf3acd5fbbaf004513853cccd77761" +version = "0.1.1" +source = "git+https://github.com/servo/io-surface-rs#aaaa5da1f2d75958fc1a3a06648717be4ea08283" dependencies = [ "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -926,7 +958,7 @@ dependencies = [ "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -963,16 +995,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "layers" version = "0.1.0" -source = "git+https://github.com/servo/rust-layers#5af8c6bb9801e4f8d337c6a74a0bb2641ab48e0e" +source = "git+https://github.com/servo/rust-layers#82672814604f5e4293fcc9d2f89055a85ad87c11" dependencies = [ - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "egl 0.1.0 (git+https://github.com/servo/rust-egl)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.0.1 (git+https://github.com/servo/rust-glx)", - "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)", + "io-surface 0.1.1 (git+https://github.com/servo/io-surface-rs)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", @@ -984,15 +1016,15 @@ dependencies = [ name = "layout" version = "0.0.1" dependencies = [ - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "canvas 0.0.1", "canvas_traits 0.0.1", "clock_ticks 0.0.6 (git+https://github.com/tomaka/clock_ticks)", "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gfx_traits 0.0.1", @@ -1010,7 +1042,7 @@ dependencies = [ "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1025,7 +1057,7 @@ dependencies = [ name = "layout_traits" version = "0.0.1" dependencies = [ - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "msg 0.0.1", @@ -1033,7 +1065,7 @@ dependencies = [ "profile_traits 0.0.1", "script_traits 0.0.1", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1144,21 +1176,21 @@ dependencies = [ name = "msg" version = "0.0.1" dependencies = [ - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", - "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)", + "io-surface 0.1.1 (git+https://github.com/servo/io-surface-rs)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)", "plugins 0.0.1", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1170,7 +1202,7 @@ version = "0.0.1" dependencies = [ "cookie 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", @@ -1207,7 +1239,7 @@ dependencies = [ name = "net_traits" version = "0.0.1" dependencies = [ - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", @@ -1217,7 +1249,7 @@ dependencies = [ "regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", "regex_macros 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1271,19 +1303,20 @@ dependencies = [ [[package]] name = "offscreen_gl_context" version = "0.1.0" -source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#5b4bd591f785232019f0d6a0bc018d7cb6274125" +source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#a33af19355dfdd0076a3f2836dc66e0fea44bcab" dependencies = [ "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "glutin 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1406,7 +1439,7 @@ dependencies = [ "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "plugins 0.0.1", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1489,7 +1522,7 @@ name = "script" version = "0.0.1" dependencies = [ "angle 0.1.0 (git+https://github.com/ecoal95/angle?branch=servo)", - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "canvas 0.0.1", "canvas_traits 0.0.1", @@ -1497,7 +1530,7 @@ dependencies = [ "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1542,9 +1575,9 @@ dependencies = [ name = "script_traits" version = "0.0.1" dependencies = [ - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -1552,7 +1585,7 @@ dependencies = [ "plugins 0.0.1", "profile_traits 0.0.1", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1602,7 +1635,7 @@ dependencies = [ [[package]] name = "serde_macros" -version = "0.5.3" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "serde_codegen 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1634,17 +1667,17 @@ source = "git+https://github.com/huonw/simd#be4242121e081206d8769cc60a7d2fa8e23c [[package]] name = "skia" version = "0.0.20130412" -source = "git+https://github.com/servo/skia#c743b93629bbd60e8c0cab7b9f2fddb9877d64b2" +source = "git+https://github.com/servo/skia#d1885f1d721d1cb5a32ab932f07866eba7c01c13" dependencies = [ "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "egl 0.1.0 (git+https://github.com/servo/rust-egl)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "expat-sys 2.1.0 (git+https://github.com/servo/libexpat)", "fontconfig 0.1.0 (git+https://github.com/servo/rust-fontconfig)", "freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.0.1 (git+https://github.com/servo/rust-glx)", - "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)", + "io-surface 0.1.1 (git+https://github.com/servo/io-surface-rs)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1706,11 +1739,11 @@ dependencies = [ name = "style" version = "0.0.1" dependencies = [ - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1720,7 +1753,7 @@ dependencies = [ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1733,9 +1766,9 @@ dependencies = [ name = "style_tests" version = "0.0.1" dependencies = [ - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1750,7 +1783,7 @@ name = "style_traits" version = "0.0.1" dependencies = [ "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1758,7 +1791,7 @@ dependencies = [ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1882,11 +1915,11 @@ dependencies = [ name = "util" version = "0.0.1" dependencies = [ - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1903,7 +1936,7 @@ dependencies = [ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1913,7 +1946,7 @@ dependencies = [ name = "util_tests" version = "0.0.1" dependencies = [ - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "util 0.0.1", diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index 45304b6d43e..b7417cc3e50 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -119,10 +119,12 @@ version = "0.2" features = [ "serde_serialization" ] [dependencies.euclid] -version = "0.2" +version = "0.3" +features = ["plugins"] [dependencies.layers] git = "https://github.com/servo/rust-layers" +features = ["plugins"] [dependencies.gleam] version = "0.1" diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 3d035b379a9..9f0a2dfdcfc 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -31,7 +31,7 @@ version = "0.2" features = [ "serde_serialization" ] [dependencies] -app_units = "0.1" +app_units = {version = "0.1", features = ["plugins"]} log = "0.3" encoding = "0.2" fnv = "1.0" @@ -43,6 +43,6 @@ lazy_static = "0.1.10" smallvec = "0.1" string_cache = "0.1" string_cache_plugin = "0.1" -euclid = "0.2" +euclid = {version = "0.3", features = ["plugins"]} serde = "0.6" -serde_macros = "0.5" +serde_macros = "0.6" diff --git a/components/style_traits/Cargo.toml b/components/style_traits/Cargo.toml index ee58ecfc66f..414bdf87ce2 100644 --- a/components/style_traits/Cargo.toml +++ b/components/style_traits/Cargo.toml @@ -26,10 +26,10 @@ version = "0.2" features = [ "serde_serialization" ] [dependencies] -euclid = "0.2" +euclid = {version = "0.3", features = ["plugins"]} log = "0.3" lazy_static = "0.1.10" num = "0.1.24" rustc-serialize = "0.3" serde = "0.6" -serde_macros = "0.5" +serde_macros = "0.6" diff --git a/components/util/Cargo.toml b/components/util/Cargo.toml index dbed5e468cb..7eac36662d3 100644 --- a/components/util/Cargo.toml +++ b/components/util/Cargo.toml @@ -20,12 +20,14 @@ path = "../plugins" [dependencies.azure] git = "https://github.com/servo/rust-azure" +features = ["plugins"] [dependencies.js] git = "https://github.com/servo/rust-mozjs" [dependencies.layers] git = "https://github.com/servo/rust-layers" +features = ["plugins"] [dependencies.cssparser] version = "0.3" @@ -42,7 +44,7 @@ features = [ "serde_serialization" ] git = "https://github.com/servo/rust-selectors" [dependencies] -app_units = "0.1" +app_units = {version = "0.1", features = ["plugins"]} log = "0.3" bitflags = "0.3" html5ever = { version = "0.2.1", features = ["unstable"] } @@ -52,9 +54,9 @@ rustc-serialize = "0.3" smallvec = "0.1" num_cpus = "0.2.2" num = "0.1.24" -euclid = "0.2" +euclid = {version = "0.3", features = ["plugins"]} serde = "0.6" -serde_macros = "0.5" +serde_macros = "0.6" string_cache = "0.1" lazy_static = "0.1" getopts = "0.2.11" diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 65aafad158e..123a6d8994b 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -2,7 +2,7 @@ name = "embedding" version = "0.0.1" dependencies = [ - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "cocoa 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "compositing 0.0.1", @@ -10,7 +10,7 @@ dependencies = [ "core-graphics 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)", "devtools 0.0.1", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "glutin_app 0.0.1", @@ -64,13 +64,13 @@ dependencies = [ [[package]] name = "app_units" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -80,21 +80,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "azure" -version = "0.1.0" -source = "git+https://github.com/servo/rust-azure#cf625c81bcbc412e3d79303a35fe7828e3fc615d" +version = "0.2.0" +source = "git+https://github.com/servo/rust-azure#5a5701c269cb7cb65f6c690122ef75c268f8d44d" dependencies = [ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)", "egl 0.1.0 (git+https://github.com/servo/rust-egl)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)", "heapsize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "skia 0.0.20130412 (git+https://github.com/servo/skia)", "x11 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -137,10 +137,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "canvas" version = "0.0.1" dependencies = [ - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "canvas_traits 0.0.1", "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", @@ -156,16 +156,16 @@ dependencies = [ name = "canvas_traits" version = "0.0.1" dependencies = [ - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)", "plugins 0.0.1", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -239,15 +239,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "compositing" version = "0.0.1" dependencies = [ - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "canvas 0.0.1", "canvas_traits 0.0.1", "clipboard 0.0.3 (git+https://github.com/aweinstock314/rust-clipboard)", "core-graphics 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)", "devtools_traits 0.0.1", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gfx_traits 0.0.1", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -315,7 +315,7 @@ dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -343,7 +343,7 @@ dependencies = [ "plugins 0.0.1", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -360,7 +360,7 @@ dependencies = [ "plugins 0.0.1", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -475,15 +475,17 @@ dependencies = [ [[package]] name = "euclid" -version = "0.2.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "heapsize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_plugin 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -578,14 +580,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "gfx" version = "0.0.1" dependencies = [ - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "fontconfig 0.1.0 (git+https://github.com/servo/rust-fontconfig)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", @@ -604,7 +606,7 @@ dependencies = [ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "simd 0.1.0 (git+https://github.com/huonw/simd)", "skia 0.0.20130412 (git+https://github.com/servo/skia)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -620,7 +622,7 @@ dependencies = [ name = "gfx_traits" version = "0.0.1" dependencies = [ - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", ] [[package]] @@ -698,6 +700,36 @@ dependencies = [ ] [[package]] +name = "glutin" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "android_glue 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cocoa 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_common 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kernel32-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "khronos_api 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "objc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "osmesa-sys 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "shared_library 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "user32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-kbd 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-window 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "x11-dl 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "glutin_app" version = "0.0.1" dependencies = [ @@ -705,7 +737,7 @@ dependencies = [ "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "compositing 0.0.1", "egl 0.1.0 (git+https://github.com/servo/rust-egl)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "glutin 0.4.0 (git+https://github.com/servo/glutin?branch=servo)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", @@ -855,12 +887,12 @@ dependencies = [ [[package]] name = "io-surface" -version = "0.1.0" -source = "git+https://github.com/servo/io-surface-rs#c558d64ea5cf3acd5fbbaf004513853cccd77761" +version = "0.1.1" +source = "git+https://github.com/servo/io-surface-rs#aaaa5da1f2d75958fc1a3a06648717be4ea08283" dependencies = [ "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -876,7 +908,7 @@ dependencies = [ "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -913,16 +945,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "layers" version = "0.1.0" -source = "git+https://github.com/servo/rust-layers#5af8c6bb9801e4f8d337c6a74a0bb2641ab48e0e" +source = "git+https://github.com/servo/rust-layers#82672814604f5e4293fcc9d2f89055a85ad87c11" dependencies = [ - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "egl 0.1.0 (git+https://github.com/servo/rust-egl)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.0.1 (git+https://github.com/servo/rust-glx)", - "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)", + "io-surface 0.1.1 (git+https://github.com/servo/io-surface-rs)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", @@ -934,15 +966,15 @@ dependencies = [ name = "layout" version = "0.0.1" dependencies = [ - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "canvas 0.0.1", "canvas_traits 0.0.1", "clock_ticks 0.0.6 (git+https://github.com/tomaka/clock_ticks)", "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gfx_traits 0.0.1", @@ -960,7 +992,7 @@ dependencies = [ "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -975,7 +1007,7 @@ dependencies = [ name = "layout_traits" version = "0.0.1" dependencies = [ - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "msg 0.0.1", @@ -983,7 +1015,7 @@ dependencies = [ "profile_traits 0.0.1", "script_traits 0.0.1", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1094,21 +1126,21 @@ dependencies = [ name = "msg" version = "0.0.1" dependencies = [ - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", - "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)", + "io-surface 0.1.1 (git+https://github.com/servo/io-surface-rs)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)", "plugins 0.0.1", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1120,7 +1152,7 @@ version = "0.0.1" dependencies = [ "cookie 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", @@ -1141,7 +1173,7 @@ dependencies = [ name = "net_traits" version = "0.0.1" dependencies = [ - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", @@ -1151,7 +1183,7 @@ dependencies = [ "regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", "regex_macros 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1205,19 +1237,20 @@ dependencies = [ [[package]] name = "offscreen_gl_context" version = "0.1.0" -source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#5b4bd591f785232019f0d6a0bc018d7cb6274125" +source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#a33af19355dfdd0076a3f2836dc66e0fea44bcab" dependencies = [ "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "glutin 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1338,7 +1371,7 @@ dependencies = [ "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "plugins 0.0.1", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1421,7 +1454,7 @@ name = "script" version = "0.0.1" dependencies = [ "angle 0.1.0 (git+https://github.com/ecoal95/angle?branch=servo)", - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "canvas 0.0.1", "canvas_traits 0.0.1", @@ -1429,7 +1462,7 @@ dependencies = [ "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1466,9 +1499,9 @@ dependencies = [ name = "script_traits" version = "0.0.1" dependencies = [ - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -1476,7 +1509,7 @@ dependencies = [ "plugins 0.0.1", "profile_traits 0.0.1", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1526,7 +1559,7 @@ dependencies = [ [[package]] name = "serde_macros" -version = "0.5.3" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "serde_codegen 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1543,7 +1576,7 @@ dependencies = [ "devtools 0.0.1", "devtools_traits 0.0.1", "env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "glutin_app 0.0.1", @@ -1590,17 +1623,17 @@ source = "git+https://github.com/huonw/simd#be4242121e081206d8769cc60a7d2fa8e23c [[package]] name = "skia" version = "0.0.20130412" -source = "git+https://github.com/servo/skia#c743b93629bbd60e8c0cab7b9f2fddb9877d64b2" +source = "git+https://github.com/servo/skia#d1885f1d721d1cb5a32ab932f07866eba7c01c13" dependencies = [ "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "egl 0.1.0 (git+https://github.com/servo/rust-egl)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "expat-sys 2.1.0 (git+https://github.com/servo/libexpat)", "fontconfig 0.1.0 (git+https://github.com/servo/rust-fontconfig)", "freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.0.1 (git+https://github.com/servo/rust-glx)", - "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)", + "io-surface 0.1.1 (git+https://github.com/servo/io-surface-rs)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1662,11 +1695,11 @@ dependencies = [ name = "style" version = "0.0.1" dependencies = [ - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1676,7 +1709,7 @@ dependencies = [ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1690,7 +1723,7 @@ name = "style_traits" version = "0.0.1" dependencies = [ "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1698,7 +1731,7 @@ dependencies = [ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1822,11 +1855,11 @@ dependencies = [ name = "util" version = "0.0.1" dependencies = [ - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1843,7 +1876,7 @@ dependencies = [ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.toml b/ports/cef/Cargo.toml index 9a012820aa4..530da8228be 100644 --- a/ports/cef/Cargo.toml +++ b/ports/cef/Cargo.toml @@ -12,7 +12,7 @@ crate-type = ["dylib"] log = "*" url = "*" libc = "*" -euclid = "0.2" +euclid = {version = "0.3", features = ["plugins"]} gleam = "0.1" [dependencies.servo] @@ -53,12 +53,14 @@ path = "../../components/devtools" [dependencies.azure] git = "https://github.com/servo/rust-azure" +features = ["plugins"] [dependencies.js] git = "https://github.com/servo/rust-mozjs" [dependencies.layers] git = "https://github.com/servo/rust-layers" +features = ["plugins"] [dependencies.stb_image] git = "https://github.com/servo/rust-stb-image" diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml index a38a40fc6b2..935c1378700 100644 --- a/ports/glutin/Cargo.toml +++ b/ports/glutin/Cargo.toml @@ -17,7 +17,7 @@ bitflags = "0.3" libc = "0.1" url = "0.2" gleam = "0.1" -euclid = "0.2" +euclid = {version = "0.3", features = ["plugins"]} [dependencies.compositing] path = "../../components/compositing" @@ -27,6 +27,7 @@ path = "../../components/script_traits" [dependencies.layers] git = "https://github.com/servo/rust-layers" +features = ["plugins"] [dependencies.msg] path = "../../components/msg" diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 0b872ec8ec8..b5847d95b1f 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -7,7 +7,7 @@ dependencies = [ "egl 0.1.0 (git+https://github.com/servo/rust-egl)", "env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "errno 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", @@ -42,6 +42,11 @@ dependencies = [ ] [[package]] +name = "android_glue" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "angle" version = "0.1.0" source = "git+https://github.com/ecoal95/angle?branch=servo#cea8b791169ead77407868db7d90ffbea106e570" @@ -51,13 +56,13 @@ dependencies = [ [[package]] name = "app_units" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -67,21 +72,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "azure" -version = "0.1.0" -source = "git+https://github.com/servo/rust-azure#cf625c81bcbc412e3d79303a35fe7828e3fc615d" +version = "0.2.0" +source = "git+https://github.com/servo/rust-azure#5a5701c269cb7cb65f6c690122ef75c268f8d44d" dependencies = [ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)", "egl 0.1.0 (git+https://github.com/servo/rust-egl)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)", "heapsize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "skia 0.0.20130412 (git+https://github.com/servo/skia)", "x11 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -99,6 +104,11 @@ dependencies = [ [[package]] name = "bitflags" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "bitflags" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -119,10 +129,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "canvas" version = "0.0.1" dependencies = [ - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "canvas_traits 0.0.1", "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", @@ -138,16 +148,16 @@ dependencies = [ name = "canvas_traits" version = "0.0.1" dependencies = [ - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)", "plugins 0.0.1", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -202,6 +212,17 @@ dependencies = [ ] [[package]] +name = "cocoa" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "objc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "color_quant" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -210,15 +231,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "compositing" version = "0.0.1" dependencies = [ - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "canvas 0.0.1", "canvas_traits 0.0.1", "clipboard 0.0.3 (git+https://github.com/aweinstock314/rust-clipboard)", "core-graphics 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)", "devtools_traits 0.0.1", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gfx_traits 0.0.1", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -286,7 +307,7 @@ dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -314,7 +335,7 @@ dependencies = [ "plugins 0.0.1", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -331,13 +352,38 @@ dependencies = [ "plugins 0.0.1", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] [[package]] +name = "dlib" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "dwmapi-sys" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "dylib" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "egl" version = "0.1.0" source = "git+https://github.com/servo/rust-egl#b21a3eafc321bd498231fcd4f4704fd90898ebf4" @@ -431,15 +477,17 @@ dependencies = [ [[package]] name = "euclid" -version = "0.2.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "heapsize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "heapsize_plugin 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -518,6 +566,14 @@ dependencies = [ ] [[package]] +name = "gdi32-sys" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "getopts" version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -526,14 +582,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "gfx" version = "0.0.1" dependencies = [ - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "fontconfig 0.1.0 (git+https://github.com/servo/rust-fontconfig)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", @@ -552,7 +608,7 @@ dependencies = [ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "simd 0.1.0 (git+https://github.com/huonw/simd)", "skia 0.0.20130412 (git+https://github.com/servo/skia)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -568,7 +624,7 @@ dependencies = [ name = "gfx_traits" version = "0.0.1" dependencies = [ - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", ] [[package]] @@ -615,6 +671,36 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "glutin" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "android_glue 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cocoa 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_common 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kernel32-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "khronos_api 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "objc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "osmesa-sys 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "shared_library 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "user32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-kbd 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-window 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "x11-dl 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "glx" version = "0.0.1" source = "git+https://github.com/servo/rust-glx#75ed2359f50c16c60f871e2f5f146e2016d8453d" @@ -750,12 +836,12 @@ dependencies = [ [[package]] name = "io-surface" -version = "0.1.0" -source = "git+https://github.com/servo/io-surface-rs#c558d64ea5cf3acd5fbbaf004513853cccd77761" +version = "0.1.1" +source = "git+https://github.com/servo/io-surface-rs#aaaa5da1f2d75958fc1a3a06648717be4ea08283" dependencies = [ "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -771,7 +857,7 @@ dependencies = [ "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -808,16 +894,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "layers" version = "0.1.0" -source = "git+https://github.com/servo/rust-layers#5af8c6bb9801e4f8d337c6a74a0bb2641ab48e0e" +source = "git+https://github.com/servo/rust-layers#82672814604f5e4293fcc9d2f89055a85ad87c11" dependencies = [ - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "egl 0.1.0 (git+https://github.com/servo/rust-egl)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.0.1 (git+https://github.com/servo/rust-glx)", - "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)", + "io-surface 0.1.1 (git+https://github.com/servo/io-surface-rs)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", @@ -829,15 +915,15 @@ dependencies = [ name = "layout" version = "0.0.1" dependencies = [ - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "canvas 0.0.1", "canvas_traits 0.0.1", "clock_ticks 0.0.6 (git+https://github.com/tomaka/clock_ticks)", "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gfx_traits 0.0.1", @@ -855,7 +941,7 @@ dependencies = [ "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -870,7 +956,7 @@ dependencies = [ name = "layout_traits" version = "0.0.1" dependencies = [ - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "msg 0.0.1", @@ -878,7 +964,7 @@ dependencies = [ "profile_traits 0.0.1", "script_traits 0.0.1", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -968,6 +1054,15 @@ dependencies = [ ] [[package]] +name = "mmap" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "mozjs_sys" version = "0.0.0" source = "git+https://github.com/servo/mozjs#74e7e954f5445ca0297772d5df543c270339dec2" @@ -980,21 +1075,21 @@ dependencies = [ name = "msg" version = "0.0.1" dependencies = [ - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", - "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)", + "io-surface 0.1.1 (git+https://github.com/servo/io-surface-rs)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)", "plugins 0.0.1", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1006,7 +1101,7 @@ version = "0.0.1" dependencies = [ "cookie 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", @@ -1027,7 +1122,7 @@ dependencies = [ name = "net_traits" version = "0.0.1" dependencies = [ - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", @@ -1037,7 +1132,7 @@ dependencies = [ "regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", "regex_macros 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1091,19 +1186,20 @@ dependencies = [ [[package]] name = "offscreen_gl_context" version = "0.1.0" -source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#5b4bd591f785232019f0d6a0bc018d7cb6274125" +source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#a33af19355dfdd0076a3f2836dc66e0fea44bcab" dependencies = [ "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "glutin 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1130,6 +1226,15 @@ dependencies = [ ] [[package]] +name = "osmesa-sys" +version = "0.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "shared_library 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "phf" version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1215,7 +1320,7 @@ dependencies = [ "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "plugins 0.0.1", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1298,7 +1403,7 @@ name = "script" version = "0.0.1" dependencies = [ "angle 0.1.0 (git+https://github.com/ecoal95/angle?branch=servo)", - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "canvas 0.0.1", "canvas_traits 0.0.1", @@ -1306,7 +1411,7 @@ dependencies = [ "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1343,9 +1448,9 @@ dependencies = [ name = "script_traits" version = "0.0.1" dependencies = [ - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -1353,7 +1458,7 @@ dependencies = [ "plugins 0.0.1", "profile_traits 0.0.1", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1403,7 +1508,7 @@ dependencies = [ [[package]] name = "serde_macros" -version = "0.5.3" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "serde_codegen 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1420,7 +1525,7 @@ dependencies = [ "devtools 0.0.1", "devtools_traits 0.0.1", "env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", @@ -1440,6 +1545,24 @@ dependencies = [ ] [[package]] +name = "shared_library" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "shell32-sys" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "simd" version = "0.1.0" source = "git+https://github.com/huonw/simd#be4242121e081206d8769cc60a7d2fa8e23cdc68" @@ -1447,17 +1570,17 @@ source = "git+https://github.com/huonw/simd#be4242121e081206d8769cc60a7d2fa8e23c [[package]] name = "skia" version = "0.0.20130412" -source = "git+https://github.com/servo/skia#c743b93629bbd60e8c0cab7b9f2fddb9877d64b2" +source = "git+https://github.com/servo/skia#d1885f1d721d1cb5a32ab932f07866eba7c01c13" dependencies = [ "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "egl 0.1.0 (git+https://github.com/servo/rust-egl)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "expat-sys 2.1.0 (git+https://github.com/servo/libexpat)", "fontconfig 0.1.0 (git+https://github.com/servo/rust-fontconfig)", "freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.0.1 (git+https://github.com/servo/rust-glx)", - "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)", + "io-surface 0.1.1 (git+https://github.com/servo/io-surface-rs)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1519,11 +1642,11 @@ dependencies = [ name = "style" version = "0.0.1" dependencies = [ - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1533,7 +1656,7 @@ dependencies = [ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1547,7 +1670,7 @@ name = "style_traits" version = "0.0.1" dependencies = [ "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1555,7 +1678,7 @@ dependencies = [ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1576,6 +1699,17 @@ dependencies = [ ] [[package]] +name = "tempfile" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "kernel32-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "tenacious" version = "0.0.11" source = "git+https://github.com/Manishearth/rust-tenacious#f9916c35fd76fdbe984659ab3ce30d752739f114" @@ -1668,11 +1802,11 @@ dependencies = [ name = "util" version = "0.0.1" dependencies = [ - "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", + "app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.2.0 (git+https://github.com/servo/rust-azure)", "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1689,7 +1823,7 @@ dependencies = [ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1710,6 +1844,39 @@ version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "wayland-client" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "dlib 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wayland-kbd" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "mmap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wayland-window" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "byteorder 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", + "tempfile 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "websocket" version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1744,6 +1911,15 @@ dependencies = [ ] [[package]] +name = "x11-dl" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "dylib 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "xml-rs" version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/ports/gonk/Cargo.toml b/ports/gonk/Cargo.toml index 86564015f70..1eb72e16c63 100644 --- a/ports/gonk/Cargo.toml +++ b/ports/gonk/Cargo.toml @@ -10,6 +10,7 @@ path = "../../components/compositing" [dependencies.layers] git = "https://github.com/servo/rust-layers" +features = ["plugins"] [dependencies.msg] path = "../../components/msg" @@ -51,5 +52,5 @@ url = "0.2.16" time = "0.1.17" errno = "0.1" libc = "0.1" -euclid = "0.2" +euclid = {version = "0.3", features = ["plugins"]} gleam = "0.1" diff --git a/tests/unit/style/Cargo.toml b/tests/unit/style/Cargo.toml index c1f690dec33..b8f0cb51476 100644 --- a/tests/unit/style/Cargo.toml +++ b/tests/unit/style/Cargo.toml @@ -21,9 +21,9 @@ path = "../../../components/util" git = "https://github.com/servo/rust-selectors" [dependencies] -app_units = "0.1" +app_units = {version = "0.1", features = ["plugins"]} url = "0.2" cssparser = "0.3.1" string_cache = "0.1" string_cache_plugin = "0.1" -euclid = "0.2" +euclid = {version = "0.3", features = ["plugins"]} diff --git a/tests/unit/util/Cargo.toml b/tests/unit/util/Cargo.toml index 73351c4f6c7..8ee9189d231 100644 --- a/tests/unit/util/Cargo.toml +++ b/tests/unit/util/Cargo.toml @@ -17,5 +17,5 @@ path = "../../../components/plugins" [dependencies] libc = "0.1" -euclid = "0.2" +euclid = {version = "0.3", features = ["plugins"]} |