Update WR (box shadows + per-corner radii, elliptical clips).

components/gfx/display_list/mod.rs

@@ -875,9 +875,7 @@ pub struct BoxShadowDisplayItem {
     pub spread_radius: Au,
 
     /// The border radius of this shadow.
-    ///
-    /// TODO(pcwalton): Elliptical radii; different radii for each corner.
-    pub border_radius: Au,
+    pub border_radius: BorderRadii<Au>,
 
     /// How we should clip the result.
     pub clip_mode: BoxShadowClipMode,

components/layout/display_list_builder.rs

@@ -71,8 +71,8 @@ use style_traits::CSSPixel;
 use style_traits::ToCss;
 use style_traits::cursor::Cursor;
 use table_cell::CollapsedBordersForCell;
-use webrender_api::{ClipAndScrollInfo, ClipId, ColorF, ComplexClipRegion, GradientStop, LineStyle};
-use webrender_api::{LocalClip, RepeatMode, ScrollPolicy, ScrollSensitivity, StickyFrameInfo};
+use webrender_api::{ClipAndScrollInfo, ClipId, ClipMode, ColorF, ComplexClipRegion, GradientStop};
+use webrender_api::{LineStyle, LocalClip, RepeatMode, ScrollPolicy, ScrollSensitivity, StickyFrameInfo};
 use webrender_api::StickySideConstraint;
 use webrender_helpers::{ToBorderRadius, ToMixBlendMode, ToRectF, ToTransformStyle};
 
@@ -980,6 +980,7 @@ impl FragmentDisplayListBuilding for Fragment {
             LocalClip::RoundedRect(bounds.to_rectf(), ComplexClipRegion::new(
                 bounds.to_rectf(),
                 border_radii.to_border_radius(),
+                ClipMode::Clip,
              ))
         } else {
             LocalClip::Rect(bounds.to_rectf())
@@ -1479,6 +1480,7 @@ impl FragmentDisplayListBuilding for Fragment {
                                                       self.node,
                                                       style.get_cursor(Cursor::Default),
                                                       display_list_section);
+            let border_radius = build_border_radius(absolute_bounds, style.get_border());
             state.add_display_item(DisplayItem::BoxShadow(Box::new(BoxShadowDisplayItem {
                 base: base,
                 box_bounds: *absolute_bounds,
@@ -1487,9 +1489,7 @@ impl FragmentDisplayListBuilding for Fragment {
                                       Au::from(box_shadow.base.vertical)),
                 blur_radius: Au::from(box_shadow.base.blur),
                 spread_radius: Au::from(box_shadow.spread),
-                border_radius: model::specified_border_radius(style.get_border()
-                                                                   .border_top_left_radius,
-                                                              absolute_bounds.size).width,
+                border_radius,
                 clip_mode: if box_shadow.inset {
                     BoxShadowClipMode::Inset
                 } else {
@@ -2013,6 +2013,7 @@ impl FragmentDisplayListBuilding for Fragment {
                     stacking_relative_border_box.to_rectf(),
                     ComplexClipRegion::new(stacking_relative_content_box.to_rectf(),
                                            radii.to_border_radius(),
+                                           ClipMode::Clip,
                  ))
             } else {
                 LocalClip::Rect(stacking_relative_border_box.to_rectf())

components/layout/webrender_helpers.rs

@@ -16,7 +16,7 @@ use style::computed_values::{image_rendering, mix_blend_mode, transform_style};
 use style::values::computed::{BorderStyle, Filter};
 use style::values::generics::effects::Filter as GenericFilter;
 use webrender_api::{self, ClipAndScrollInfo, ComplexClipRegion, DisplayListBuilder};
-use webrender_api::{ExtendMode, LayoutTransform};
+use webrender_api::{ClipMode, ExtendMode, LayoutTransform};
 
 pub trait WebRenderDisplayListConverter {
     fn convert_to_webrender(&self, pipeline_id: PipelineId) -> DisplayListBuilder;
@@ -447,7 +447,7 @@ impl WebRenderDisplayItemConverter for DisplayItem {
                                         item.color,
                                         item.blur_radius.to_f32_px(),
                                         item.spread_radius.to_f32_px(),
-                                        item.border_radius.to_f32_px(),
+                                        item.border_radius.to_border_radius(),
                                         item.clip_mode.to_clip_mode());
             }
             DisplayItem::PushTextShadow(ref item) => {
@@ -528,6 +528,7 @@ impl ToWebRenderClip for ClippingRegion {
             ComplexClipRegion::new(
                 complex_clipping_region.rect.to_rectf(),
                 complex_clipping_region.radii.to_border_radius(),
+                ClipMode::Clip,
              )
         }).collect()
     }