diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-02-09 15:51:29 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-09 15:51:29 -0800 |
| commit | e985ad54229083e5e76b2862cec57ce4fef4433c (patch) | |
| tree | 151eeb17007f252c278aaa13e38deba3af5bee9d /components/layout/display_list_builder.rs | |
| parent | ce7827eadfcceb37e779846926c2b2f72c08dd72 (diff) | |
| parent | 779d93669855c787bde3a66e0bdf06aec27a9004 (diff) | |
| download | servo-e985ad54229083e5e76b2862cec57ce4fef4433c.tar.gz servo-e985ad54229083e5e76b2862cec57ce4fef4433c.zip | |
Auto merge of #15463 - Manishearth:buncha-props, r=mbrubeck
stylo: Implement a bunch of properties
r? @mbrubeck or @heycam
<!-- 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/15463)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/display_list_builder.rs')
| -rw-r--r-- | components/layout/display_list_builder.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/components/layout/display_list_builder.rs b/components/layout/display_list_builder.rs index 1285d5cef7a..4dc72f20301 100644 --- a/components/layout/display_list_builder.rs +++ b/components/layout/display_list_builder.rs @@ -1176,10 +1176,11 @@ impl FragmentDisplayListBuilding for Fragment { fn adjust_clip_for_style(&self, parent_clip: &mut ClippingRegion, stacking_relative_border_box: &Rect<Au>) { + use style::values::Either; // Account for `clip` per CSS 2.1 § 11.1.2. let style_clip_rect = match (self.style().get_box().position, - self.style().get_effects().clip.0) { - (position::T::absolute, Some(style_clip_rect)) => style_clip_rect, + self.style().get_effects().clip) { + (position::T::absolute, Either::First(style_clip_rect)) => style_clip_rect, _ => return, }; |