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

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

Browse source
This commit is contained in:
Glenn Watson 2017-10-20 07:36:19 +10:00
parent fe16c1d5c3
commit aaaf644c91
5 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/layout/display_list_builder.rs
View file

@ -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())