diff --git a/Cargo.lock b/Cargo.lock index 8f70f7e6aa8..09142051e74 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -333,7 +333,7 @@ dependencies = [ "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", "offscreen_gl_context 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", - "webrender_api 0.47.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.48.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -346,7 +346,7 @@ dependencies = [ "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_api 0.47.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.48.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -497,8 +497,8 @@ dependencies = [ "servo_url 0.0.1", "style_traits 0.0.1", "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender 0.47.0 (git+https://github.com/servo/webrender)", - "webrender_api 0.47.0 (git+https://github.com/servo/webrender)", + "webrender 0.48.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.48.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -534,7 +534,7 @@ dependencies = [ "servo_remutex 0.0.1", "servo_url 0.0.1", "style_traits 0.0.1", - "webrender_api 0.47.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.48.0 (git+https://github.com/servo/webrender)", "webvr_traits 0.0.1", ] @@ -770,7 +770,7 @@ dependencies = [ "servo_geometry 0.0.1", "servo_url 0.0.1", "style_traits 0.0.1", - "webrender_api 0.47.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.48.0 (git+https://github.com/servo/webrender)", "x11 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1074,7 +1074,7 @@ dependencies = [ "truetype 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-bidi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_api 0.47.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.48.0 (git+https://github.com/servo/webrender)", "xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "xml5ever 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1155,7 +1155,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_api 0.47.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.48.0 (git+https://github.com/servo/webrender)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1470,7 +1470,7 @@ dependencies = [ "style_traits 0.0.1", "unicode-bidi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_api 0.47.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.48.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1514,7 +1514,7 @@ dependencies = [ "servo_geometry 0.0.1", "servo_url 0.0.1", "style 0.0.1", - "webrender_api 0.47.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.48.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1528,7 +1528,7 @@ dependencies = [ "profile_traits 0.0.1", "script_traits 0.0.1", "servo_url 0.0.1", - "webrender_api 0.47.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.48.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1612,8 +1612,8 @@ dependencies = [ "style 0.0.1", "style_traits 0.0.1", "webdriver_server 0.0.1", - "webrender 0.47.0 (git+https://github.com/servo/webrender)", - "webrender_api 0.47.0 (git+https://github.com/servo/webrender)", + "webrender 0.48.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.48.0 (git+https://github.com/servo/webrender)", "webvr 0.0.1", "webvr_traits 0.0.1", ] @@ -1775,7 +1775,7 @@ dependencies = [ "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_api 0.47.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.48.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1825,7 +1825,7 @@ dependencies = [ "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_api 0.47.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.48.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1883,7 +1883,7 @@ dependencies = [ "servo_url 0.0.1", "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_api 0.47.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.48.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -2484,7 +2484,7 @@ dependencies = [ "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "utf-8 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_api 0.47.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.48.0 (git+https://github.com/servo/webrender)", "webvr 0.0.1", "webvr_traits 0.0.1", "xml5ever 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2515,7 +2515,7 @@ dependencies = [ "servo_atoms 0.0.1", "servo_url 0.0.1", "style 0.0.1", - "webrender_api 0.47.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.48.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -2560,7 +2560,7 @@ dependencies = [ "style_traits 0.0.1", "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_api 0.47.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.48.0 (git+https://github.com/servo/webrender)", "webvr_traits 0.0.1", ] @@ -3421,8 +3421,8 @@ dependencies = [ [[package]] name = "webrender" -version = "0.47.0" -source = "git+https://github.com/servo/webrender#33e6e285553e8f5ab4b17f3ff8f4eeecd76d2264" +version = "0.48.0" +source = "git+https://github.com/servo/webrender#80453c8168a176342801fcbabdcf06a601c07c4d" dependencies = [ "app_units 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3445,13 +3445,13 @@ dependencies = [ "rayon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "thread_profiler 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_api 0.47.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.48.0 (git+https://github.com/servo/webrender)", ] [[package]] name = "webrender_api" -version = "0.47.0" -source = "git+https://github.com/servo/webrender#33e6e285553e8f5ab4b17f3ff8f4eeecd76d2264" +version = "0.48.0" +source = "git+https://github.com/servo/webrender#80453c8168a176342801fcbabdcf06a601c07c4d" dependencies = [ "app_units 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3477,7 +3477,7 @@ dependencies = [ "msg 0.0.1", "script_traits 0.0.1", "servo_config 0.0.1", - "webrender_api 0.47.0 (git+https://github.com/servo/webrender)", + "webrender_api 0.48.0 (git+https://github.com/servo/webrender)", "webvr_traits 0.0.1", ] @@ -3861,8 +3861,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.47.0 (git+https://github.com/servo/webrender)" = "" -"checksum webrender_api 0.47.0 (git+https://github.com/servo/webrender)" = "" +"checksum webrender 0.48.0 (git+https://github.com/servo/webrender)" = "" +"checksum webrender_api 0.48.0 (git+https://github.com/servo/webrender)" = "" "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/layout/display_list_builder.rs b/components/layout/display_list_builder.rs index 0e3d810f7cf..f527d18f5ec 100644 --- a/components/layout/display_list_builder.rs +++ b/components/layout/display_list_builder.rs @@ -2080,7 +2080,6 @@ impl FragmentDisplayListBuilding for Fragment { stacking_relative_content_box: &Rect, text_shadows: &[SimpleShadow], clip: &Rect) { - // NB: The order for painting text components (CSS Text Decoration Module Level 3) is: // shadows, underline, overline, text, text-emphasis, and then line-through. @@ -2124,7 +2123,7 @@ impl FragmentDisplayListBuilding for Fragment { // to back). // Shadows - for shadow in text_shadows.iter().rev() { + for shadow in text_shadows.iter() { state.add_display_item(DisplayItem::PushTextShadow(box PushTextShadowDisplayItem { base: base.clone(), blur_radius: shadow.blur,