Auto merge of #23979 - Eijebong:deps-deps-deps, r=<try>

Update webrender, image, png and raqote This will avoid duping png because of the raqote backend  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23979)
servo · Aug 15, 2019 · 2fd6587 · 2fd6587
2 parents 91469aa + 138ef57
commit 2fd6587
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 42 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml
@@ -21,7 +21,7 @@ embedder_traits = {path = "../embedder_traits"}
 euclid = "0.20"
 gfx_traits = {path = "../gfx_traits"}
 gleam = {version = "0.6", optional = true}
-image = "0.21"
+image = "0.22"
 ipc-channel = "0.11"
 libc = "0.2"
 keyboard-types = "0.4.3"

diff --git a/components/layout/display_list/webrender_helpers.rs b/components/layout/display_list/webrender_helpers.rs
@@ -230,6 +230,7 @@ impl WebRenderDisplayItemConverter for DisplayItem {
                         raster_space: RasterSpace::Screen,
                         // TODO(pcwalton): Enable picture caching?
                         cache_tiles: false,
+                        is_backdrop_root: false,
                     },
                 };
 

diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml
@@ -20,7 +20,7 @@ headers = "0.2"
 http = "0.1"
 hyper = "0.12"
 hyper_serde = "0.11"
-piston_image = {package = "image", version = "0.21"}
+piston_image = {package = "image", version = "0.22"}
 ipc-channel = "0.11"
 lazy_static = "1"
 log = "0.4"

diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
@@ -58,7 +58,7 @@ html5ever = "0.23"
 http = "0.1"
 hyper = "0.12"
 hyper_serde = "0.11"
-image = "0.21"
+image = "0.22"
 indexmap = "1.0.2"
 ipc-channel = "0.11"
 itertools = "0.8"

diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml
@@ -16,7 +16,7 @@ cookie = "0.11"
 crossbeam-channel = "0.3"
 euclid = "0.20"
 hyper = "0.12"
-image = "0.21"
+image = "0.22"
 ipc-channel = "0.11"
 keyboard-types = "0.4.3"
 log = "0.4"

diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml
@@ -64,7 +64,7 @@ webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
 webxr = { git = "https://github.com/servo/webxr", features = ["ipc", "glwindow", "headless"] }
 
 [target.'cfg(any(target_os = "linux", target_os = "windows"))'.dependencies]
-image = "0.21"
+image = "0.22"
 
 [target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies]
 osmesa-sys = "0.1.2"

diff --git a/ports/glutin/headed_window.rs b/ports/glutin/headed_window.rs
@@ -675,7 +675,7 @@ fn load_icon(icon_bytes: &[u8]) -> Icon {
         let (width, height) = image.dimensions();
         let mut rgba = Vec::with_capacity((width * height) as usize * 4);
         for (_, _, pixel) in image.pixels() {
-            rgba.extend_from_slice(&pixel.to_rgba().data);
+            rgba.extend_from_slice(&pixel.to_rgba().0);
         }
         (rgba, width, height)
     };