diff options
| -rw-r--r-- | Cargo.lock | 77 | ||||
| -rw-r--r-- | components/net/image_cache.rs | 1 |
2 files changed, 40 insertions, 38 deletions
diff --git a/Cargo.lock b/Cargo.lock index 7b3f88ed6ca..900d1770819 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -291,13 +291,13 @@ dependencies = [ "canvas_traits 0.0.1", "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", "offscreen_gl_context 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", - "webrender_traits 0.33.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -311,7 +311,7 @@ dependencies = [ "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.33.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -341,7 +341,7 @@ name = "cgl" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gleam 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -419,7 +419,7 @@ version = "0.0.1" dependencies = [ "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", - "gleam 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -432,8 +432,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.32.0 (git+https://github.com/servo/webrender)", - "webrender_traits 0.33.0 (git+https://github.com/servo/webrender)", + "webrender 0.33.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -468,7 +468,7 @@ dependencies = [ "servo_remutex 0.0.1", "servo_url 0.0.1", "style_traits 0.0.1", - "webrender_traits 0.33.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", "webvr_traits 0.0.1", ] @@ -702,7 +702,7 @@ dependencies = [ "compositing 0.0.1", "devtools 0.0.1", "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "glutin_app 0.0.1", "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", "libservo 0.0.1", @@ -715,7 +715,7 @@ dependencies = [ "servo_geometry 0.0.1", "servo_url 0.0.1", "style_traits 0.0.1", - "webrender_traits 0.33.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", "x11 2.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1001,7 +1001,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.33.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", "xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1046,7 +1046,7 @@ dependencies = [ [[package]] name = "gleam" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gl_generator 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1066,7 +1066,7 @@ dependencies = [ "compositing 0.0.1", "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", @@ -1080,7 +1080,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.33.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.34.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)", ] @@ -1266,7 +1266,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "leaky-cow 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1398,7 +1398,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.33.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1438,7 +1438,7 @@ dependencies = [ "servo_geometry 0.0.1", "servo_url 0.0.1", "style 0.0.1", - "webrender_traits 0.33.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1452,7 +1452,7 @@ dependencies = [ "profile_traits 0.0.1", "script_traits 0.0.1", "servo_url 0.0.1", - "webrender_traits 0.33.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1511,7 +1511,7 @@ dependencies = [ "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "gaol 0.0.1 (git+https://github.com/servo/gaol)", "gfx 0.0.1", - "gleam 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "layout_thread 0.0.1", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1529,8 +1529,8 @@ dependencies = [ "style 0.0.1", "style_traits 0.0.1", "webdriver_server 0.0.1", - "webrender 0.32.0 (git+https://github.com/servo/webrender)", - "webrender_traits 0.33.0 (git+https://github.com/servo/webrender)", + "webrender 0.33.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", "webvr 0.0.1", "webvr_traits 0.0.1", ] @@ -1679,7 +1679,7 @@ dependencies = [ "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.33.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1723,7 +1723,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.33.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1782,7 +1782,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.33.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1871,7 +1871,7 @@ dependencies = [ "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "libloading 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2309,7 +2309,7 @@ dependencies = [ "unicode-segmentation 1.1.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.33.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", "webvr 0.0.1", "webvr_traits 0.0.1", "xml5ever 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2532,7 +2532,7 @@ dependencies = [ "cmake 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "expat-sys 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "io-surface 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3172,8 +3172,8 @@ dependencies = [ [[package]] name = "webrender" -version = "0.32.0" -source = "git+https://github.com/servo/webrender#9973efd033ceb40edcebea68077766a5f096cfb3" +version = "0.33.0" +source = "git+https://github.com/servo/webrender#f687ff6c3df63a6846f7f96c71c4d76b34f7198e" dependencies = [ "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3187,7 +3187,7 @@ dependencies = [ "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)", "gamma-lut 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3195,25 +3195,26 @@ 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.33.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", ] [[package]] name = "webrender_traits" -version = "0.33.0" -source = "git+https://github.com/servo/webrender#9973efd033ceb40edcebea68077766a5f096cfb3" +version = "0.34.0" +source = "git+https://github.com/servo/webrender#f687ff6c3df63a6846f7f96c71c4d76b34f7198e" 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.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.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "offscreen_gl_context 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3225,7 +3226,7 @@ dependencies = [ "msg 0.0.1", "script_traits 0.0.1", "servo_config 0.0.1", - "webrender_traits 0.33.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.34.0 (git+https://github.com/servo/webrender)", "webvr_traits 0.0.1", ] @@ -3404,7 +3405,7 @@ dependencies = [ "checksum getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9047cfbd08a437050b363d35ef160452c5fe8ea5187ae0a624708c91581d685" "checksum gif 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8a80d6fe9e52f637df9afd4779449a7be17c39cc9c35b01589bb833f956ba596" "checksum gl_generator 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f1d8edc81c5ae84605a62f5dac661a2313003b26d59839f81d47d46cf0f16a55" -"checksum gleam 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3232655dbe4fc5ab688c05024f2c816b5d20c19ad8216d5c7d85cf915b24e005" +"checksum gleam 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9c46ff982a2e6abed1f50b3077d3176836875d9720906b248335f4c93827a345" "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" "checksum glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b280007fa9c7442cfd1e0b1addb8d1a59240267110e8705f8f7e2c7bfb7e2f72" "checksum harfbuzz-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6b76113246f5c089dcf272cf89c3f61168a4d77b50ec5b2c1fab8c628c9ea762" @@ -3567,8 +3568,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.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d548aabf87411b1b4ba91fd07eacd8b238135c7131a452b8a9f6386209167e18" -"checksum webrender 0.32.0 (git+https://github.com/servo/webrender)" = "<none>" -"checksum webrender_traits 0.33.0 (git+https://github.com/servo/webrender)" = "<none>" +"checksum webrender 0.33.0 (git+https://github.com/servo/webrender)" = "<none>" +"checksum webrender_traits 0.34.0 (git+https://github.com/servo/webrender)" = "<none>" "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" "checksum ws 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "04614a58714f3fd4a8b1da4bcae9f031c532d35988c3d39627619248113f8be8" diff --git a/components/net/image_cache.rs b/components/net/image_cache.rs index 67d23f194ff..9dcbf331cf4 100644 --- a/components/net/image_cache.rs +++ b/components/net/image_cache.rs @@ -91,6 +91,7 @@ fn is_image_opaque(format: webrender_traits::ImageFormat, bytes: &[u8]) -> bool is_opaque } webrender_traits::ImageFormat::RGB8 => true, + webrender_traits::ImageFormat::RG8 => true, webrender_traits::ImageFormat::A8 => false, webrender_traits::ImageFormat::Invalid | webrender_traits::ImageFormat::RGBAF32 => unreachable!(), } |