diff --git a/Cargo.lock b/Cargo.lock index de85b0e14b0..b1af7250f6d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -283,7 +283,7 @@ dependencies = [ "num-traits 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", "offscreen_gl_context 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", - "webrender_traits 0.21.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.22.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -297,7 +297,7 @@ dependencies = [ "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.21.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.22.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -418,8 +418,8 @@ dependencies = [ "servo_url 0.0.1", "style_traits 0.0.1", "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender 0.20.0 (git+https://github.com/servo/webrender)", - "webrender_traits 0.21.0 (git+https://github.com/servo/webrender)", + "webrender 0.21.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.22.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -452,7 +452,7 @@ dependencies = [ "servo_remutex 0.0.1", "servo_url 0.0.1", "style_traits 0.0.1", - "webrender_traits 0.21.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.22.0 (git+https://github.com/servo/webrender)", "webvr_traits 0.0.1", ] @@ -674,7 +674,7 @@ dependencies = [ [[package]] name = "dwrote" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -682,7 +682,7 @@ dependencies = [ "lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_codegen 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -707,7 +707,7 @@ dependencies = [ "servo_geometry 0.0.1", "servo_url 0.0.1", "style_traits 0.0.1", - "webrender_traits 0.21.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.22.0 (git+https://github.com/servo/webrender)", "x11 2.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -964,7 +964,7 @@ dependencies = [ "core-foundation 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "dwrote 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "dwrote 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "fontsan 0.3.2 (git+https://github.com/servo/fontsan)", @@ -994,7 +994,7 @@ dependencies = [ "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", "truetype 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.21.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.22.0 (git+https://github.com/servo/webrender)", "xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1073,7 +1073,7 @@ dependencies = [ "servo_url 0.0.1", "style_traits 0.0.1", "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.21.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.22.0 (git+https://github.com/servo/webrender)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1375,7 +1375,7 @@ dependencies = [ "style_traits 0.0.1", "unicode-bidi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.21.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.22.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1415,7 +1415,7 @@ dependencies = [ "servo_geometry 0.0.1", "servo_url 0.0.1", "style 0.0.1", - "webrender_traits 0.21.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.22.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1429,7 +1429,7 @@ dependencies = [ "profile_traits 0.0.1", "script_traits 0.0.1", "servo_url 0.0.1", - "webrender_traits 0.21.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.22.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1514,8 +1514,8 @@ dependencies = [ "style 0.0.1", "style_traits 0.0.1", "webdriver_server 0.0.1", - "webrender 0.20.0 (git+https://github.com/servo/webrender)", - "webrender_traits 0.21.0 (git+https://github.com/servo/webrender)", + "webrender 0.21.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.22.0 (git+https://github.com/servo/webrender)", "webvr 0.0.1", "webvr_traits 0.0.1", ] @@ -1662,7 +1662,7 @@ dependencies = [ "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.21.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.22.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1700,7 +1700,7 @@ dependencies = [ "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.21.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.22.0 (git+https://github.com/servo/webrender)", "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1759,7 +1759,7 @@ dependencies = [ "servo_url 0.0.1", "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.21.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.22.0 (git+https://github.com/servo/webrender)", "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2297,7 +2297,7 @@ dependencies = [ "tinyfiledialogs 2.5.9 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.21.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.22.0 (git+https://github.com/servo/webrender)", "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", "webvr 0.0.1", "webvr_traits 0.0.1", @@ -2395,26 +2395,6 @@ name = "serde" version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "serde_codegen" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "quote 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_codegen_internals 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_syntax 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "serde_codegen_internals" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "syn 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "serde_codegen_internals" version = "0.13.0" @@ -2823,15 +2803,6 @@ dependencies = [ "style_traits 0.0.1", ] -[[package]] -name = "syn" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "quote 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "syn" version = "0.11.8" @@ -3188,8 +3159,8 @@ dependencies = [ [[package]] name = "webrender" -version = "0.20.0" -source = "git+https://github.com/servo/webrender#235cdd38c767ad1969dff40b7fd780d4764bff8f" +version = "0.21.0" +source = "git+https://github.com/servo/webrender#9565e58d2636108415009ba76690a5dff9019c52" dependencies = [ "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.0.0-alpha2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3198,7 +3169,7 @@ dependencies = [ "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "dwrote 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "dwrote 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3211,18 +3182,18 @@ dependencies = [ "thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "threadpool 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.21.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.22.0 (git+https://github.com/servo/webrender)", ] [[package]] name = "webrender_traits" -version = "0.21.0" -source = "git+https://github.com/servo/webrender#235cdd38c767ad1969dff40b7fd780d4764bff8f" +version = "0.22.0" +source = "git+https://github.com/servo/webrender#9565e58d2636108415009ba76690a5dff9019c52" dependencies = [ "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "dwrote 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "dwrote 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3257,7 +3228,7 @@ dependencies = [ "msg 0.0.1", "script_traits 0.0.1", "servo_config 0.0.1", - "webrender_traits 0.21.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.22.0 (git+https://github.com/servo/webrender)", "webvr_traits 0.0.1", ] @@ -3403,7 +3374,7 @@ dependencies = [ "checksum device 0.0.1 (git+https://github.com/servo/devices)" = "" "checksum dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80c8b71fd71146990a9742fc06dcbbde19161a267e0ad4e572c35162f4578c90" "checksum dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07c4c7cc7b396419bc0a4d90371d0cee16cb5053b53647d287c0b728000c41fe" -"checksum dwrote 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3aaa348263128e64ebdae55b48e85fe57258db2d21ffa1ac32ef18e6545333" +"checksum dwrote 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "74114b6b49d6731835da7a28a3642651451e315f7f9b9d04e907e65a45681796" "checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" "checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" "checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" @@ -3533,8 +3504,6 @@ dependencies = [ "checksum scoped_threadpool 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "3ef399c8893e8cb7aa9696e895427fab3a6bf265977bb96e126f24ddd2cda85a" "checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac" "checksum serde 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1e0ed773960f90a78567fcfbe935284adf50c5d7cf119aa2cf43bb0b4afa69bb" -"checksum serde_codegen 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1f94de585a73dfc312ca77194209278a587bf90d3edc6c2d0fc479b0ed71d1f0" -"checksum serde_codegen_internals 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "afad7924a009f859f380e4a2e3a509a845c2ac66435fcead74a4d983b21ae806" "checksum serde_codegen_internals 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c3172bf2940b975c0e4f6ab42a511c0a4407d4f46ccef87a9d3615db5c26fa96" "checksum serde_derive 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6af30425c5161deb200aac4803c62b903eb3be7e889c5823d0e16c4ce0ce989c" "checksum serde_json 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb96d30e4e6f9fc52e08f51176d078b6f79b981dc3ed4134f7b850be9f446a8" @@ -3558,7 +3527,6 @@ dependencies = [ "checksum string_cache_codegen 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0c9dfe1a7c8bba1ecb90730d269fdc08afe93d23c28dd6c4aa5cabd79a05a05e" "checksum string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc" "checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694" -"checksum syn 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)" = "58fd09df59565db3399efbba34ba8a2fec1307511ebd245d0061ff9d42691673" "checksum syn 0.11.8 (registry+https://github.com/rust-lang/crates.io-index)" = "37c279fb816210c9bb28b2c292664581e7b87b4561e86b94df462664d8620bb8" "checksum synom 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8fece1853fb872b0acdc3ff88f37c474018e125ef81cd4cb8c0ca515746b62ed" "checksum synstructure 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ccc9780bf1aa601943988c2876ab22413c01ad1739689aa6af18d0aa0b3f38b" @@ -3599,8 +3567,8 @@ dependencies = [ "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" "checksum walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "bb08f9e670fab86099470b97cd2b252d6527f0b3cc1401acdb595ffc9dd288ff" "checksum webdriver 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cdc28802daddee94267a657ffeac2593a33881fb7a3a44fedd320b1319efcaf6" -"checksum webrender 0.20.0 (git+https://github.com/servo/webrender)" = "" -"checksum webrender_traits 0.21.0 (git+https://github.com/servo/webrender)" = "" +"checksum webrender 0.21.0 (git+https://github.com/servo/webrender)" = "" +"checksum webrender_traits 0.22.0 (git+https://github.com/servo/webrender)" = "" "checksum websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a1a6ea5ed0367f32eb3d94dcc58859ef4294b5f75ba983dbf56ac314af45d" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml index 5a5c6e54f58..bce8baa679c 100644 --- a/components/canvas/Cargo.toml +++ b/components/canvas/Cargo.toml @@ -20,8 +20,4 @@ log = "0.3.5" num-traits = "0.1.32" offscreen_gl_context = "0.6" servo_config = {path = "../config"} - -[dependencies.webrender_traits] -git = "https://github.com/servo/webrender" -default-features = false -features = ["serde_derive"] +webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]} diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml index ff6248dedb9..4d586946f72 100644 --- a/components/canvas_traits/Cargo.toml +++ b/components/canvas_traits/Cargo.toml @@ -17,8 +17,4 @@ heapsize_derive = "0.1" ipc-channel = "0.7" serde = {version = "0.9", features = ["unstable"]} serde_derive = "0.9" - -[dependencies.webrender_traits] -git = "https://github.com/servo/webrender" -default-features = false -features = ["serde_derive", "ipc"] +webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]} diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml index aec4550a72f..773e92cd0e7 100644 --- a/components/compositing/Cargo.toml +++ b/components/compositing/Cargo.toml @@ -25,13 +25,5 @@ servo_geometry = {path = "../geometry", features = ["servo"]} servo_url = {path = "../url", features = ["servo"]} style_traits = {path = "../style_traits"} time = "0.1.17" - -[dependencies.webrender] -git = "https://github.com/servo/webrender" -default-features = false -features = ["serde_derive"] - -[dependencies.webrender_traits] -git = "https://github.com/servo/webrender" -default-features = false -features = ["serde_derive", "ipc"] +webrender = {git = "https://github.com/servo/webrender"} +webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]} diff --git a/components/constellation/Cargo.toml b/components/constellation/Cargo.toml index 568edb9586d..e694998403a 100644 --- a/components/constellation/Cargo.toml +++ b/components/constellation/Cargo.toml @@ -36,11 +36,7 @@ servo_rand = {path = "../rand"} servo_remutex = {path = "../remutex"} servo_url = {path = "../url", features = ["servo"]} webvr_traits = {path = "../webvr_traits"} - -[dependencies.webrender_traits] -git = "https://github.com/servo/webrender" -default-features = false -features = ["serde_derive", "ipc"] +webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]} [target.'cfg(not(target_os = "windows"))'.dependencies] gaol = {git = "https://github.com/servo/gaol"} diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index b178d9f0a77..b4e3247ea51 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -38,13 +38,9 @@ style = {path = "../style"} style_traits = {path = "../style_traits"} time = "0.1.12" unicode-script = {version = "0.1", features = ["harfbuzz"]} +webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]} xi-unicode = "0.1.0" -[dependencies.webrender_traits] -git = "https://github.com/servo/webrender" -default-features = false -features = ["serde_derive", "ipc"] - [target.'cfg(target_os = "macos")'.dependencies] byteorder = "1.0" core-foundation = "0.3" @@ -59,5 +55,5 @@ servo-fontconfig = "0.2.1" simd = "0.2.0" [target.'cfg(target_os = "windows")'.dependencies] -dwrote = "0.2" +dwrote = "0.3" truetype = "0.26" diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index 7b58136107b..1012e5d283b 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -45,8 +45,4 @@ style = {path = "../style"} style_traits = {path = "../style_traits"} unicode-bidi = "0.2" unicode-script = {version = "0.1", features = ["harfbuzz"]} - -[dependencies.webrender_traits] -git = "https://github.com/servo/webrender" -default-features = false -features = ["serde_derive", "ipc"] +webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]} diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml index 2a46f3a2789..caed2b8cb83 100644 --- a/components/layout_thread/Cargo.toml +++ b/components/layout_thread/Cargo.toml @@ -36,8 +36,4 @@ servo_config = {path = "../config"} servo_geometry = {path = "../geometry"} servo_url = {path = "../url"} style = {path = "../style"} - -[dependencies.webrender_traits] -git = "https://github.com/servo/webrender" -default-features = false -features = ["serde_derive", "ipc"] +webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]} diff --git a/components/layout_traits/Cargo.toml b/components/layout_traits/Cargo.toml index 3391077d93a..3d4d6e520d4 100644 --- a/components/layout_traits/Cargo.toml +++ b/components/layout_traits/Cargo.toml @@ -17,8 +17,4 @@ net_traits = {path = "../net_traits"} profile_traits = {path = "../profile_traits"} script_traits = {path = "../script_traits"} servo_url = {path = "../url"} - -[dependencies.webrender_traits] -git = "https://github.com/servo/webrender" -default-features = false -features = ["serde_derive", "ipc"] +webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]} diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml index 884c78a828f..01b3305cd67 100644 --- a/components/msg/Cargo.toml +++ b/components/msg/Cargo.toml @@ -16,8 +16,4 @@ heapsize = "0.3.0" heapsize_derive = "0.1" serde = "0.9" serde_derive = "0.9" - -[dependencies.webrender_traits] -git = "https://github.com/servo/webrender" -default-features = false -features = ["serde_derive", "ipc"] +webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]} diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index b938a5f4066..7147236fe8b 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -40,12 +40,8 @@ time = "0.1.17" unicase = "1.4.0" url = {version = "1.2", features = ["heap_size"]} uuid = {version = "0.4", features = ["v4"]} +webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]} websocket = "0.17" -[dependencies.webrender_traits] -git = "https://github.com/servo/webrender" -default-features = false -features = ["serde_derive", "ipc"] - [target.'cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))'.dependencies] tinyfiledialogs = "2.5.9" diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml index c571d850701..295ba8f976c 100644 --- a/components/net_traits/Cargo.toml +++ b/components/net_traits/Cargo.toml @@ -27,9 +27,5 @@ servo_config = {path = "../config", features = ["servo"]} servo_url = {path = "../url", features = ["servo"]} url = {version = "1.2", features = ["heap_size"]} uuid = {version = "0.4", features = ["v4", "serde"]} +webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]} websocket = "0.17" - -[dependencies.webrender_traits] -git = "https://github.com/servo/webrender" -default-features = false -features = ["serde_derive", "ipc"] diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 74910cddda6..4567bab4272 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -88,10 +88,6 @@ url = {version = "1.2", features = ["heap_size", "query_encoding"]} uuid = {version = "0.4", features = ["v4"]} websocket = "0.17" xml5ever = {version = "0.4", features = ["unstable"]} +webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]} webvr = {path = "../webvr"} webvr_traits = {path = "../webvr_traits"} - -[dependencies.webrender_traits] -git = "https://github.com/servo/webrender" -default-features = false -features = ["nightly", "serde_derive", "ipc"] diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index 65cca19c9e7..b857b2a3935 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -49,19 +49,11 @@ servo_geometry = {path = "../geometry"} servo_url = {path = "../url"} style = {path = "../style", features = ["servo"]} style_traits = {path = "../style_traits", features = ["servo"]} +webrender = {git = "https://github.com/servo/webrender"} +webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]} +webdriver_server = {path = "../webdriver_server", optional = true} webvr = {path = "../webvr"} webvr_traits = {path = "../webvr_traits"} -webdriver_server = {path = "../webdriver_server", optional = true} - -[dependencies.webrender] -git = "https://github.com/servo/webrender" -default-features = false -features = ["serde_derive"] - -[dependencies.webrender_traits] -git = "https://github.com/servo/webrender" -default-features = false -features = ["serde_derive", "ipc"] [target.'cfg(not(target_os = "windows"))'.dependencies] gaol = {git = "https://github.com/servo/gaol"} diff --git a/components/webvr/Cargo.toml b/components/webvr/Cargo.toml index ce23e9f89be..a7c65440618 100644 --- a/components/webvr/Cargo.toml +++ b/components/webvr/Cargo.toml @@ -16,8 +16,4 @@ msg = {path = "../msg"} script_traits = {path = "../script_traits"} servo_config = {path = "../config"} webvr_traits = {path = "../webvr_traits" } - -[dependencies.webrender_traits] -git = "https://github.com/servo/webrender" -default_features = false -features = ["serde_derive"] +webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]} diff --git a/ports/cef/Cargo.toml b/ports/cef/Cargo.toml index 6fb5fad5dcf..68c565a2a37 100644 --- a/ports/cef/Cargo.toml +++ b/ports/cef/Cargo.toml @@ -33,11 +33,7 @@ servo_config = {path = "../../components/config"} servo_geometry = {path = "../../components/geometry"} servo_url = {path = "../../components/url"} style_traits = {path = "../../components/style_traits"} - -[dependencies.webrender_traits] -git = "https://github.com/servo/webrender" -default-features = false -features = ["serde_derive", "ipc"] +webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]} [target.'cfg(target_os="macos")'.dependencies] objc = "0.2" diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml index 567f54ae694..2f1a8d6cc0d 100644 --- a/ports/glutin/Cargo.toml +++ b/ports/glutin/Cargo.toml @@ -22,10 +22,7 @@ servo_geometry = {path = "../../components/geometry"} servo_config = {path = "../../components/config"} servo_url = {path = "../../components/url"} style_traits = {path = "../../components/style_traits"} - -[dependencies.webrender_traits] -git = "https://github.com/servo/webrender" -default_features = false +webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]} [target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies] osmesa-sys = "0.1.2"