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

WIP: Dedupe dependencies

Browse source
This commit is contained in:
Bastien Orivel 2018-07-12 22:07:19 +02:00 • committed by Glenn Watson
parent 8eb2a53e20
commit 6354cd9a5e
11 changed files with 49 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/canvas/Cargo.toml
View file

@ -20,7 +20,7 @@ gleam = "0.5"
ipc-channel = "0.10"
log = "0.4"
num-traits = "0.1.32"
offscreen_gl_context = {version = "0.17", features = ["serde", "osmesa"]}
offscreen_gl_context = {version = "0.18", features = ["serde", "osmesa"]}
serde_bytes = "0.10"
servo_config = {path = "../config"}
webrender = {git = "https://github.com/servo/webrender"}

2
components/canvas_traits/Cargo.toml
View file

@ -17,7 +17,7 @@ gleam = "0.5.1"
lazy_static = "1"
malloc_size_of = { path = "../malloc_size_of" }
malloc_size_of_derive = { path = "../malloc_size_of_derive" }
offscreen_gl_context = {version = "0.17", features = ["serde"]}
offscreen_gl_context = {version = "0.18", features = ["serde"]}
serde = "1.0"
serde_bytes = "0.10"
servo_config = {path = "../config"}

2
components/compositing/Cargo.toml
View file

@ -18,7 +18,7 @@ embedder_traits = {path = "../embedder_traits"}
euclid = "0.17"
gfx_traits = {path = "../gfx_traits"}
gleam = {version = "0.5", optional = true}
image = "0.18"
image = "0.19"
ipc-channel = "0.10"
libc = "0.2"
log = "0.4"

3
components/compositing/compositor.rs
View file

@ -281,6 +281,7 @@ impl webrender_api::RenderNotifier for RenderNotifier {
_document_id: webrender_api::DocumentId,
scrolled: bool,
composite_needed: bool,
_render_time_ns: Option<u64>,
) {
if scrolled {
self.compositor_proxy.send(Msg::NewScrollFrameReady(composite_needed));
@ -1268,7 +1269,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
Ok(mut file) => {
let img = gl::draw_img(gl, rt_info, width, height);
let dynamic_image = DynamicImage::ImageRgb8(img);
if let Err(e) = dynamic_image.save(&mut file, ImageFormat::PNG) {
if let Err(e) = dynamic_image.write_to(&mut file, ImageFormat::PNG) {
error!("Failed to save {} ({}).", path, e);
}
},

6
components/gfx/Cargo.toml
View file

@ -46,9 +46,9 @@ ucd = "0.1.1"
[target.'cfg(target_os = "macos")'.dependencies]
byteorder = "1.0"
core-foundation = "0.5"
core-graphics = "0.13"
core-text = "9.0"
core-foundation = "0.6"
core-graphics = "0.14"
core-text = "10.0"
[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
freetype = "0.4"

2
components/net_traits/Cargo.toml
View file

@ -16,7 +16,7 @@ cookie = "0.10"
embedder_traits = { path = "../embedder_traits" }
hyper = "0.10"
hyper_serde = "0.8"
image = "0.18"
image = "0.19"
ipc-channel = "0.10"
lazy_static = "1"
log = "0.4"

4
components/script/Cargo.toml
View file

@ -52,7 +52,7 @@ half = "1.0"
html5ever = "0.22"
hyper = "0.10"
hyper_serde = "0.8"
image = "0.18"
image = "0.19"
ipc-channel = "0.10"
itertools = "0.7.6"
jstraceable_derive = {path = "../jstraceable_derive"}
@ -69,7 +69,7 @@ mozjs = { version = "0.7.1", features = ["promises"]}
msg = {path = "../msg"}
net_traits = {path = "../net_traits"}
num-traits = "0.1.32"
offscreen_gl_context = {version = "0.17", features = ["serde"]}
offscreen_gl_context = {version = "0.18", features = ["serde"]}
parking_lot = "0.5"
phf = "0.7.18"
profile_traits = {path = "../profile_traits"}

2
components/webdriver_server/Cargo.toml
View file

@ -14,7 +14,7 @@ base64 = "0.6"
cookie = "0.10"
euclid = "0.17"
hyper = "0.10"
image = "0.18"
image = "0.19"
ipc-channel = "0.10"
log = "0.4"
msg = {path = "../msg"}

2
components/webdriver_server/lib.rs
View file

@ -836,7 +836,7 @@ impl Handler {
let rgb = RgbImage::from_raw(img.width, img.height, img.bytes.to_vec()).unwrap();
let mut png_data = Vec::new();
DynamicImage::ImageRgb8(rgb).save(&mut png_data, ImageFormat::PNG).unwrap();
DynamicImage::ImageRgb8(rgb).write_to(&mut png_data, ImageFormat::PNG).unwrap();
let encoded = base64::encode(&png_data);
Ok(WebDriverResponse::Generic(ValueResponse::new(encoded.to_json())))