diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-07-01 05:14:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-01 05:14:21 -0400 |
| commit | c71c55e542c57f6ec4e5e77be750f74f50340e56 (patch) | |
| tree | 730aad03158a733d126d8cabe09e92792b31e05e /components/layout/display_list/builder.rs | |
| parent | 9c243a115ea4983bec5e79b06c49469354cfa1f9 (diff) | |
| parent | 36495d677f6e5e928c74f8eb372caaae7a303047 (diff) | |
| download | servo-c71c55e542c57f6ec4e5e77be750f74f50340e56.tar.gz servo-c71c55e542c57f6ec4e5e77be750f74f50340e56.zip | |
Auto merge of #21109 - emilio:gecko-sync, r=SimonSapin
style: sync changes from mozilla-central.
See each individual commit for details..
<!-- 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/21109)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/display_list/builder.rs')
| -rw-r--r-- | components/layout/display_list/builder.rs | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/components/layout/display_list/builder.rs b/components/layout/display_list/builder.rs index 3887f141f52..9d0de5c3f41 100644 --- a/components/layout/display_list/builder.rs +++ b/components/layout/display_list/builder.rs @@ -1219,11 +1219,7 @@ impl FragmentDisplayListBuilding for Fragment { state.add_display_item(DisplayItem::BoxShadow(Box::new(BoxShadowDisplayItem { base: base, box_bounds: absolute_bounds.to_layout(), - color: box_shadow - .base - .color - .unwrap_or(style.get_color().color) - .to_layout(), + color: style.resolve_color(box_shadow.base.color).to_layout(), offset: LayoutVector2D::new( box_shadow.base.horizontal.px(), box_shadow.base.vertical.px(), @@ -2038,10 +2034,7 @@ impl FragmentDisplayListBuilding for Fragment { base: base.clone(), shadow: webrender_api::Shadow { offset: LayoutVector2D::new(shadow.horizontal.px(), shadow.vertical.px()), - color: shadow - .color - .unwrap_or(self.style().get_color().color) - .to_layout(), + color: self.style.resolve_color(shadow.color).to_layout(), blur_radius: shadow.blur.px(), }, }, |