diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-08-13 01:53:44 -0600 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-08-13 01:53:44 -0600 |
commit | c1cc2c1a27cb6887934ab5088cccdb33434a680b (patch) | |
tree | 0d0c504600ed93975969be07febaf6bae30736d8 | |
parent | 8f55af119033e7644d560ca607ad7a89916f53e6 (diff) | |
parent | be8864ae5c78f98562a505504c2c7e6669b88920 (diff) | |
download | servo-c1cc2c1a27cb6887934ab5088cccdb33434a680b.tar.gz servo-c1cc2c1a27cb6887934ab5088cccdb33434a680b.zip |
Auto merge of #7186 - glennw:rounded-clip, r=pcwalton
Enable item clipping on normal transform layers. Fixes rounded corners on layers with 2d transforms.
Needed for #6643.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7186)
<!-- Reviewable:end -->
-rw-r--r-- | components/gfx/display_list/mod.rs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/components/gfx/display_list/mod.rs b/components/gfx/display_list/mod.rs index 323a9c037d3..bb2b6653bd9 100644 --- a/components/gfx/display_list/mod.rs +++ b/components/gfx/display_list/mod.rs @@ -1033,12 +1033,10 @@ impl<'a> Iterator for DisplayItemIterator<'a> { impl DisplayItem { /// Paints this display item into the given painting context. fn draw_into_context(&self, paint_context: &mut PaintContext) { - if paint_context.layer_kind == LayerKind::NoTransform { - let this_clip = &self.base().clip; - match paint_context.transient_clip { - Some(ref transient_clip) if transient_clip == this_clip => {} - Some(_) | None => paint_context.push_transient_clip((*this_clip).clone()), - } + let this_clip = &self.base().clip; + match paint_context.transient_clip { + Some(ref transient_clip) if transient_clip == this_clip => {} + Some(_) | None => paint_context.push_transient_clip((*this_clip).clone()), } match *self { |