From bf632baa47f71f63769f435ccb6b87bb34f021f1 Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Wed, 4 Oct 2017 17:09:40 -0500 Subject: [PATCH] servo: Merge #18735 - Update WR (clip masks on angle gradients, fix clips on transformed images) (from glennw:update-wr-angle-clips); r=mbrubeck Source-Repo: https://github.com/servo/servo Source-Revision: 22685465156a07eadca0edfcc5eca119f3ec4681 --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : 25611e482b0de27e05ed124c93899bd2251e01c2 --- servo/Cargo.lock | 4 ++-- servo/components/layout/webrender_helpers.rs | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/servo/Cargo.lock b/servo/Cargo.lock index 1f4bde30a777..2fe6824d630c 100644 --- a/servo/Cargo.lock +++ b/servo/Cargo.lock @@ -3613,7 +3613,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.52.0" -source = "git+https://github.com/servo/webrender#8ce0212a0d5c9b32b1ba11a6b20014e88321c605" +source = "git+https://github.com/servo/webrender#29d325f54bbead84e97dcf7dc536463c45f8eece" dependencies = [ "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3641,7 +3641,7 @@ dependencies = [ [[package]] name = "webrender_api" version = "0.52.0" -source = "git+https://github.com/servo/webrender#8ce0212a0d5c9b32b1ba11a6b20014e88321c605" +source = "git+https://github.com/servo/webrender#29d325f54bbead84e97dcf7dc536463c45f8eece" dependencies = [ "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/servo/components/layout/webrender_helpers.rs b/servo/components/layout/webrender_helpers.rs index 55f13d389678..8f86477e9806 100644 --- a/servo/components/layout/webrender_helpers.rs +++ b/servo/components/layout/webrender_helpers.rs @@ -458,15 +458,15 @@ impl WebRenderDisplayItemConverter for DisplayItem { } DisplayItem::PushTextShadow(ref item) => { let rect = item.base.bounds; - builder.push_text_shadow(&prim_info(rect, Some(item.base.local_clip)), - webrender_api::TextShadow { - blur_radius: item.blur_radius.to_f32_px(), - offset: item.offset.to_vectorf(), - color: item.color, - }); + builder.push_shadow(&prim_info(rect, Some(item.base.local_clip)), + webrender_api::Shadow { + blur_radius: item.blur_radius.to_f32_px(), + offset: item.offset.to_vectorf(), + color: item.color, + }); } DisplayItem::PopTextShadow(_) => { - builder.pop_text_shadow(); + builder.pop_shadow(); } DisplayItem::Iframe(ref item) => { let rect = item.base.bounds;