Commit 6d4a857a authored by Nicolas Silva's avatar Nicolas Silva
Browse files

Bug 1616804 - Update image to 0.23 in WebRender. r=jrmuizel 

Original patch by Josh Mattews in https://github.com/servo/webrender/pull/3854

Also run mach vendor rust.

Differential Revision: https://phabricator.services.mozilla.com/D63468

--HG--
extra : moz-landing-system : lando
parent 16c6f324

Cargo.lock

+11 −11
Original line number Diff line number Diff line
@@ -409,6 +409,12 @@ version = "0.3.0" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "980479e6fde23246dfb54d47580d66b4e99202e7579c5eaa9fe10ecb5ebd2182"



[[package]]

name = "bytemuck"

version = "1.2.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "37fa13df2292ecb479ec23aa06f4507928bef07839be9ef15281411076629431"



[[package]]

name = "byteorder"

version = "1.3.2"
@@ -1874,12 +1880,12 @@ dependencies = [ 


[[package]]

name = "image"

version = "0.22.1"

version = "0.23.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "663a975007e0b49903e2e8ac0db2c432c465855f2d65f17883ba1476e85f0b42"

checksum = "ef4e336ec01a678e7ab692914c641181528e8656451e6252f8f9e33728882eaf"

dependencies = [

 "bytemuck",

 "byteorder",

 "lzw",

 "num-iter",

 "num-rational",

 "num-traits",
@@ -2189,12 +2195,6 @@ dependencies = [ 
 "rand",

]



[[package]]

name = "lzw"

version = "0.10.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084"



[[package]]

name = "mach"

version = "0.3.2"
@@ -3064,9 +3064,9 @@ dependencies = [ 


[[package]]

name = "png"

version = "0.15.0"

version = "0.15.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8422b27bb2c013dd97b9aef69e161ce262236f49aaf46a0489011c8ff0264602"

checksum = "ef859a23054bbfee7811284275ae522f0434a3c8e7f4b74bd4a35ae7e1c4a283"

dependencies = [

 "bitflags",

 "crc32fast",

gfx/wr/Cargo.lock

+29 −29
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ name = "base64" 
version = "0.10.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

dependencies = [

 "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",

 "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",

]



[[package]]
@@ -118,7 +118,7 @@ name = "bincode" 
version = "1.0.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

dependencies = [

 "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",

 "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",

 "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",

]
@@ -139,7 +139,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 
dependencies = [

 "block-padding 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

 "byte-tools 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",

 "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",

 "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",

 "generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",

]
@@ -156,9 +156,14 @@ name = "byte-tools" 
version = "0.3.0"

source = "registry+https://github.com/rust-lang/crates.io-index"



[[package]]

name = "bytemuck"

version = "1.2.0"

source = "registry+https://github.com/rust-lang/crates.io-index"



[[package]]

name = "byteorder"

version = "1.2.7"

version = "1.3.4"

source = "registry+https://github.com/rust-lang/crates.io-index"



[[package]]
@@ -166,7 +171,7 @@ name = "bytes" 
version = "0.4.7"

source = "registry+https://github.com/rust-lang/crates.io-index"

dependencies = [

 "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",

 "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",

 "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

]
@@ -379,7 +384,7 @@ version = "0.7.18" 
source = "registry+https://github.com/rust-lang/crates.io-index"

dependencies = [

 "adler32 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

 "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",

 "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",

]



[[package]]
@@ -552,7 +557,7 @@ name = "fxhash" 
version = "0.2.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

dependencies = [

 "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",

 "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",

]



[[package]]
@@ -709,15 +714,15 @@ dependencies = [ 


[[package]]

name = "image"

version = "0.22.1"

version = "0.23.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

dependencies = [

 "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",

 "lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",

 "bytemuck 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

 "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",

 "num-iter 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",

 "num-rational 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",

 "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",

 "png 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",

 "png 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)",

]



[[package]]
@@ -815,11 +820,6 @@ dependencies = [ 
 "cfg-if 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",

]



[[package]]

name = "lzw"

version = "0.10.0"

source = "registry+https://github.com/rust-lang/crates.io-index"



[[package]]

name = "malloc_buf"

version = "0.0.6"
@@ -1089,7 +1089,7 @@ dependencies = [ 


[[package]]

name = "png"

version = "0.15.0"

version = "0.15.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

dependencies = [

 "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1501,7 +1501,7 @@ name = "stb_truetype" 
version = "0.2.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

dependencies = [

 "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",

 "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",

]



[[package]]
@@ -1761,7 +1761,7 @@ dependencies = [ 
 "base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",

 "bincode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",

 "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",

 "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",

 "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",

 "cfg-if 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",

 "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",

 "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1772,7 +1772,7 @@ dependencies = [ 
 "freetype 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

 "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",

 "gleam 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",

 "image 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)",

 "image 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)",

 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",

 "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",

 "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1780,7 +1780,7 @@ dependencies = [ 
 "mozangle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

 "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",

 "plane-split 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",

 "png 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",

 "png 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)",

 "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",

 "rayon 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",

 "ron 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1818,7 +1818,7 @@ version = "0.61.0" 
dependencies = [

 "app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",

 "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",

 "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",

 "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",

 "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",

 "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",

 "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1923,7 +1923,7 @@ dependencies = [ 
 "app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",

 "base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",

 "bincode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",

 "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",

 "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",

 "clap 2.31.2 (registry+https://github.com/rust-lang/crates.io-index)",

 "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",

 "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1934,7 +1934,7 @@ dependencies = [ 
 "font-loader 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",

 "gleam 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",

 "glutin 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)",

 "image 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)",

 "image 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)",

 "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",

 "mozangle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

 "osmesa-src 0.1.1 (git+https://github.com/servo/osmesa-src)",
@@ -1955,7 +1955,7 @@ name = "ws" 
version = "0.9.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

dependencies = [

 "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",

 "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",

 "bytes 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",

 "httparse 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)",

 "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2030,7 +2030,8 @@ dependencies = [ 
"checksum block-buffer 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49665c62e0e700857531fa5d3763e91b539ff1abeebd56808d378b495870d60d"

"checksum block-padding 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4fc4358306e344bf9775d0197fd00d2603e5afb0771bb353538630f022068ea3"

"checksum byte-tools 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "980479e6fde23246dfb54d47580d66b4e99202e7579c5eaa9fe10ecb5ebd2182"

"checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"

"checksum bytemuck 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37fa13df2292ecb479ec23aa06f4507928bef07839be9ef15281411076629431"

"checksum byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"

"checksum bytes 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "2f1d50c876fb7545f5f289cd8b2aee3f359d073ae819eed5d6373638e2c61e59"

"checksum cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)" = "0ebb87d1116151416c0cf66a0e3fb6430cccd120fd6300794b4dfaa050ac40ba"

"checksum cfg-if 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "405216fd8fe65f718daa7102ea808a946b6ce40c742998fbfd3463645552de18"
@@ -2089,7 +2090,7 @@ dependencies = [ 
"checksum httparse 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c2f407128745b78abc95c0ffbe4e5d37427fdc0d45470710cfef8c44522a2e37"

"checksum humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0484fda3e7007f2a4a0d9c3a703ca38c71c54c55602ce4660c419fd32e188c9e"

"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"

"checksum image 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)" = "663a975007e0b49903e2e8ac0db2c432c465855f2d65f17883ba1476e85f0b42"

"checksum image 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef4e336ec01a678e7ab692914c641181528e8656451e6252f8f9e33728882eaf"

"checksum inflate 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4ec18d981200fd14e65ee8e35fb60ed1ce55227a02407303f3a72517c6146dcc"

"checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"

"checksum itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c069bbec61e1ca5a596166e55dfe4773ff745c3d16b700013bcaff9a6df2c682"
@@ -2104,7 +2105,6 @@ dependencies = [ 
"checksum linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd"

"checksum lock_api 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "949826a5ccf18c1b3a7c3d57692778d21768b79e46eb9dd07bfc4c2160036c54"

"checksum log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "89f010e843f2b1a31dbd316b3b8d443758bc634bed37aabade59c686d644e0a2"

"checksum lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084"

"checksum malloc_buf 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"

"checksum malloc_size_of_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e37c5d4cd9473c5f4c9c111f033f15d4df9bd378fdf615944e360a4f55a05f0b"

"checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376"
@@ -2135,7 +2135,7 @@ dependencies = [ 
"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"

"checksum pkg-config 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "110d5ee3593dbb73f56294327fe5668bcc997897097cbc76b51e7aed3f52452f"

"checksum plane-split 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ffe16a646a08f4b4dd74035b9ff8e378eb1a4012a74f14f5889e7001cdbece33"

"checksum png 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8422b27bb2c013dd97b9aef69e161ce262236f49aaf46a0489011c8ff0264602"

"checksum png 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef859a23054bbfee7811284275ae522f0434a3c8e7f4b74bd4a35ae7e1c4a283"

"checksum proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "d3797b7142c9aa74954e351fc089bbee7958cebbff6bf2815e7ffff0b19f547d"

"checksum proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "90cf5f418035b98e655e9cdb225047638296b862b42411c4e45bb88d700f7fc0"

"checksum procedural-masquerade 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9a1574a51c3fd37b26d2c0032b649d08a7d51d4cca9c41bbc5bf7118fa4509d0"

gfx/wr/webrender/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ cstr = "0.1.2" 
euclid = { version = "0.20.0", features = ["serde"] }

fxhash = "0.2.1"

gleam = "0.9.2"

image_loader = { optional = true, version = "0.22", package = "image", default-features = false, features = ["png_codec"] }

image_loader = { optional = true, version = "0.23", package = "image", default-features = false, features = ["png"] }

lazy_static = "1"

log = "0.4"

malloc_size_of_derive = "0.1"

gfx/wr/webrender/src/debug_server.rs

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ impl Screenshot { 
                &data,

                size.width as u32,

                size.height as u32,

                image_loader::ColorType::RGBA(8),

                image_loader::ColorType::Rgba8,

            ).unwrap();

        }

gfx/wr/wrench/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ serde = {version = "1.0", features = ["derive"] } 
semver = "0.9.0"



[dependencies.image]

version = "0.22"

version = "0.23"

default-features = false

features = ["png"]