Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #18926 - glennw:update-wr-bs, r=jdm

Browse source 
Update WR (box shadows, subpixel + alpha text)

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18926)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-10-18 23:52:54 -05:00 • committed by GitHub
commit 59d727b020
4 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -3585,7 +3585,7 @@ dependencies = [
[[package]] [[package]]
name = "webrender" name = "webrender"
version = "0.52.1" version = "0.52.1"
source = "git+https://github.com/servo/webrender#5e30fb4168a22440d91066c246eb16e35eb84e91" source = "git+https://github.com/servo/webrender#6a7b5381b21805f4e3a15cda3bbe8466bc916485"
dependencies = [ dependencies = [
"app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3613,7 +3613,7 @@ dependencies = [
[[package]] [[package]]
name = "webrender_api" name = "webrender_api"
version = "0.52.1" version = "0.52.1"
source = "git+https://github.com/servo/webrender#5e30fb4168a22440d91066c246eb16e35eb84e91" source = "git+https://github.com/servo/webrender#6a7b5381b21805f4e3a15cda3bbe8466bc916485"
dependencies = [ dependencies = [
"app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",

2
components/gfx/display_list/mod.rs
View file

@ -1153,8 +1153,6 @@ pub struct DefineClipScrollNodeItem {
/// How a box shadow should be clipped. /// How a box shadow should be clipped.
#[derive(Clone, Copy, Debug, Deserialize, MallocSizeOf, PartialEq, Serialize)] #[derive(Clone, Copy, Debug, Deserialize, MallocSizeOf, PartialEq, Serialize)]
pub enum BoxShadowClipMode { pub enum BoxShadowClipMode {
/// No special clipping should occur. This is used for (shadowed) text decorations.
None,
/// The area inside `box_bounds` should be clipped out. Corresponds to the normal CSS /// The area inside `box_bounds` should be clipped out. Corresponds to the normal CSS
/// `box-shadow`. /// `box-shadow`.
Outset, Outset,

1
components/layout/webrender_helpers.rs
View file

@ -73,7 +73,6 @@ trait ToBoxShadowClipMode {
impl ToBoxShadowClipMode for BoxShadowClipMode { impl ToBoxShadowClipMode for BoxShadowClipMode {
fn to_clip_mode(&self) -> webrender_api::BoxShadowClipMode { fn to_clip_mode(&self) -> webrender_api::BoxShadowClipMode {
match *self { match *self {
BoxShadowClipMode::None => webrender_api::BoxShadowClipMode::None,
BoxShadowClipMode::Inset => webrender_api::BoxShadowClipMode::Inset, BoxShadowClipMode::Inset => webrender_api::BoxShadowClipMode::Inset,
BoxShadowClipMode::Outset => webrender_api::BoxShadowClipMode::Outset, BoxShadowClipMode::Outset => webrender_api::BoxShadowClipMode::Outset,
} }

5
tests/wpt/metadata-css/css-backgrounds-3_dev/html4/css3-box-shadow.htm.ini Normal file
View file

@ -0,0 +1,5 @@
[css3-box-shadow.htm]
type: reftest
expected:
if os == "linux": FAIL
bug: https://github.com/servo/webrender/issues/1776