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

Further changes required by Servo

Browse source
This commit is contained in:
Oriol Brufau 2023-08-15 02:53:35 +02:00 • committed by Martin Robinson
parent b6e8088e8e
commit 274d273f50
11 changed files with 81 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

21
components/layout/display_list/builder.rs
View file

@ -653,7 +653,7 @@ impl Fragment {
absolute_bounds: Rect<Au>, absolute_bounds: Rect<Au>,
) { ) {
let background = style.get_background(); let background = style.get_background();
let background_color = style.resolve_color(background.background_color); let background_color = style.resolve_color(background.background_color.clone());
// XXXManishearth the below method should ideally use an iterator over // XXXManishearth the below method should ideally use an iterator over
// backgrounds // backgrounds
self.build_display_list_for_background_if_applicable_with_background( self.build_display_list_for_background_if_applicable_with_background(
@ -1037,7 +1037,9 @@ impl Fragment {
webrender_api::BoxShadowDisplayItem { webrender_api::BoxShadowDisplayItem {
common: items::empty_common_item_properties(), common: items::empty_common_item_properties(),
box_bounds: absolute_bounds.to_layout(), box_bounds: absolute_bounds.to_layout(),
color: style.resolve_color(box_shadow.base.color).to_layout(), color: style
.resolve_color(box_shadow.base.color.clone())
.to_layout(),
offset: LayoutVector2D::new( offset: LayoutVector2D::new(
box_shadow.base.horizontal.px(), box_shadow.base.horizontal.px(),
box_shadow.base.vertical.px(), box_shadow.base.vertical.px(),
@ -1083,10 +1085,10 @@ impl Fragment {
let border_style_struct = style.get_border(); let border_style_struct = style.get_border();
let mut colors = SideOffsets2D::new( let mut colors = SideOffsets2D::new(
border_style_struct.border_top_color, border_style_struct.border_top_color.clone(),
border_style_struct.border_right_color, border_style_struct.border_right_color.clone(),
border_style_struct.border_bottom_color, border_style_struct.border_bottom_color.clone(),
border_style_struct.border_left_color, border_style_struct.border_left_color.clone(),
); );
let mut border_style = SideOffsets2D::new( let mut border_style = SideOffsets2D::new(
border_style_struct.border_top_style, border_style_struct.border_top_style,
@ -1316,7 +1318,7 @@ impl Fragment {
// Append the outline to the display list. // Append the outline to the display list.
let color = style let color = style
.resolve_color(style.get_outline().outline_color) .resolve_color(style.get_outline().outline_color.clone())
.to_layout(); .to_layout();
let base = state.create_base_display_item( let base = state.create_base_display_item(
clip, clip,
@ -1451,7 +1453,8 @@ impl Fragment {
// TODO: Allow non-text fragments to be selected too. // TODO: Allow non-text fragments to be selected too.
if scanned_text_fragment_info.selected() { if scanned_text_fragment_info.selected() {
let style = self.selected_style(); let style = self.selected_style();
let background_color = style.resolve_color(style.get_background().background_color); let background_color =
style.resolve_color(style.get_background().background_color.clone());
let base = state.create_base_display_item( let base = state.create_base_display_item(
stacking_relative_border_box, stacking_relative_border_box,
self.node, self.node,
@ -2055,7 +2058,7 @@ impl Fragment {
base: base.clone(), base: base.clone(),
shadow: webrender_api::Shadow { shadow: webrender_api::Shadow {
offset: LayoutVector2D::new(shadow.horizontal.px(), shadow.vertical.px()), offset: LayoutVector2D::new(shadow.horizontal.px(), shadow.vertical.px()),
color: self.style.resolve_color(shadow.color).to_layout(), color: self.style.resolve_color(shadow.color.clone()).to_layout(),
blur_radius: shadow.blur.px(), blur_radius: shadow.blur.px(),
}, },
}, },

4
components/layout/display_list/gradient.rs
View file

@ -86,7 +86,7 @@ fn convert_gradient_stops(
// Only keep the color stops, discard the color interpolation hints. // Only keep the color stops, discard the color interpolation hints.
let mut stop_items = gradient_items let mut stop_items = gradient_items
.iter() .iter()
.filter_map(|item| match *item { .filter_map(|item| match item {
GradientItem::SimpleColorStop(color) => Some(ColorStop { GradientItem::SimpleColorStop(color) => Some(ColorStop {
color, color,
position: None, position: None,
@ -191,7 +191,7 @@ fn convert_gradient_stops(
assert!(offset.is_finite()); assert!(offset.is_finite());
stops.push(GradientStop { stops.push(GradientStop {
offset: offset, offset: offset,
color: style.resolve_color(stop.color).to_layout(), color: style.resolve_color(stop.color.clone()).to_layout(),
}) })
} }
stops stops

8
components/layout/table.rs
View file

@ -794,7 +794,7 @@ fn perform_border_collapse_for_row(
child_table_row child_table_row
.final_collapsed_borders .final_collapsed_borders
.inline .inline
.push_or_set(i, *this_inline_border); .push_or_set(i, this_inline_border.clone());
if i == 0 { if i == 0 {
child_table_row.final_collapsed_borders.inline[i].combine(&table_inline_borders.start); child_table_row.final_collapsed_borders.inline[i].combine(&table_inline_borders.start);
} else if i + 1 == number_of_borders_inline_direction { } else if i + 1 == number_of_borders_inline_direction {
@ -821,7 +821,7 @@ fn perform_border_collapse_for_row(
this_border.combine(&previous_block_borders[i]); this_border.combine(&previous_block_borders[i]);
} }
}, },
PreviousBlockCollapsedBorders::FromTable(table_border) => { PreviousBlockCollapsedBorders::FromTable(ref table_border) => {
this_border.combine(&table_border); this_border.combine(&table_border);
}, },
} }
@ -837,7 +837,7 @@ fn perform_border_collapse_for_row(
.iter() .iter()
.enumerate() .enumerate()
{ {
let next_block = next_block.push_or_set(i, *this_block_border); let next_block = next_block.push_or_set(i, this_block_border.clone());
match next_block_borders { match next_block_borders {
NextBlockCollapsedBorders::FromNextRow(next_block_borders) => { NextBlockCollapsedBorders::FromNextRow(next_block_borders) => {
if next_block_borders.len() > i { if next_block_borders.len() > i {
@ -1358,7 +1358,7 @@ impl<'table> TableCellStyleInfo<'table> {
if background as *const Background == initial.get_background() as *const _ { if background as *const Background == initial.get_background() as *const _ {
return; return;
} }
let background_color = sty.resolve_color(background.background_color); let background_color = sty.resolve_color(background.background_color.clone());
cell_flow.build_display_list_for_background_if_applicable_with_background( cell_flow.build_display_list_for_background_if_applicable_with_background(
state, state,
background, background,

10
components/layout/table_cell.rs
View file

@ -375,7 +375,7 @@ impl fmt::Debug for TableCellFlow {
} }
} }
#[derive(Clone, Copy, Debug, Serialize)] #[derive(Clone, Debug, Serialize)]
pub struct CollapsedBordersForCell { pub struct CollapsedBordersForCell {
pub inline_start_border: CollapsedBorder, pub inline_start_border: CollapsedBorder,
pub inline_end_border: CollapsedBorder, pub inline_end_border: CollapsedBorder,
@ -494,10 +494,10 @@ impl CollapsedBordersForCell {
) { ) {
let logical_border_colors = LogicalMargin::new( let logical_border_colors = LogicalMargin::new(
writing_mode, writing_mode,
self.block_start_border.color, self.block_start_border.color.clone(),
self.inline_end_border.color, self.inline_end_border.color.clone(),
self.block_end_border.color, self.block_end_border.color.clone(),
self.inline_start_border.color, self.inline_start_border.color.clone(),
); );
*border_colors = logical_border_colors.to_physical(writing_mode); *border_colors = logical_border_colors.to_physical(writing_mode);

28
components/layout/table_row.rs
View file

@ -718,7 +718,7 @@ impl CollapsedBorderSpacingForRow {
} }
/// All aspects of a border that can collapse with adjacent borders. See CSS 2.1 § 17.6.2.1. /// All aspects of a border that can collapse with adjacent borders. See CSS 2.1 § 17.6.2.1.
#[derive(Clone, Copy, Debug)] #[derive(Clone, Debug)]
pub struct CollapsedBorder { pub struct CollapsedBorder {
/// The style of the border. /// The style of the border.
pub style: BorderStyle, pub style: BorderStyle,
@ -771,7 +771,7 @@ impl CollapsedBorder {
CollapsedBorder { CollapsedBorder {
style: css_style.get_border().border_top_style, style: css_style.get_border().border_top_style,
width: Au::from(css_style.get_border().border_top_width), width: Au::from(css_style.get_border().border_top_width),
color: css_style.get_border().border_top_color, color: css_style.get_border().border_top_color.clone(),
provenance: provenance, provenance: provenance,
} }
} }
@ -782,7 +782,7 @@ impl CollapsedBorder {
CollapsedBorder { CollapsedBorder {
style: css_style.get_border().border_right_style, style: css_style.get_border().border_right_style,
width: Au::from(css_style.get_border().border_right_width), width: Au::from(css_style.get_border().border_right_width),
color: css_style.get_border().border_right_color, color: css_style.get_border().border_right_color.clone(),
provenance: provenance, provenance: provenance,
} }
} }
@ -796,7 +796,7 @@ impl CollapsedBorder {
CollapsedBorder { CollapsedBorder {
style: css_style.get_border().border_bottom_style, style: css_style.get_border().border_bottom_style,
width: Au::from(css_style.get_border().border_bottom_width), width: Au::from(css_style.get_border().border_bottom_width),
color: css_style.get_border().border_bottom_color, color: css_style.get_border().border_bottom_color.clone(),
provenance: provenance, provenance: provenance,
} }
} }
@ -807,7 +807,7 @@ impl CollapsedBorder {
CollapsedBorder { CollapsedBorder {
style: css_style.get_border().border_left_style, style: css_style.get_border().border_left_style,
width: Au::from(css_style.get_border().border_left_width), width: Au::from(css_style.get_border().border_left_width),
color: css_style.get_border().border_left_color, color: css_style.get_border().border_left_color.clone(),
provenance: provenance, provenance: provenance,
} }
} }
@ -883,18 +883,18 @@ impl CollapsedBorder {
match (self.style, other.style) { match (self.style, other.style) {
// Step 1. // Step 1.
(BorderStyle::Hidden, _) => {}, (BorderStyle::Hidden, _) => {},
(_, BorderStyle::Hidden) => *self = *other, (_, BorderStyle::Hidden) => *self = other.clone(),
// Step 2. // Step 2.
(BorderStyle::None, _) => *self = *other, (BorderStyle::None, _) => *self = other.clone(),
(_, BorderStyle::None) => {}, (_, BorderStyle::None) => {},
// Step 3. // Step 3.
_ if self.width > other.width => {}, _ if self.width > other.width => {},
_ if self.width < other.width => *self = *other, _ if self.width < other.width => *self = other.clone(),
(this_style, other_style) if this_style > other_style => {}, (this_style, other_style) if this_style > other_style => {},
(this_style, other_style) if this_style < other_style => *self = *other, (this_style, other_style) if this_style < other_style => *self = other.clone(),
// Step 4. // Step 4.
_ if (self.provenance as i8) >= other.provenance as i8 => {}, _ if (self.provenance as i8) >= other.provenance as i8 => {},
_ => *self = *other, _ => *self = other.clone(),
} }
} }
} }
@ -1013,22 +1013,22 @@ fn set_inline_position_of_child_flow(
.collapsed_borders_for_row .collapsed_borders_for_row
.inline .inline
.get(child_index) .get(child_index)
.map_or(CollapsedBorder::new(), |x| *x), .map_or(CollapsedBorder::new(), |x| x.clone()),
inline_end_border: border_collapse_info inline_end_border: border_collapse_info
.collapsed_borders_for_row .collapsed_borders_for_row
.inline .inline
.get(child_index + 1) .get(child_index + 1)
.map_or(CollapsedBorder::new(), |x| *x), .map_or(CollapsedBorder::new(), |x| x.clone()),
block_start_border: border_collapse_info block_start_border: border_collapse_info
.collapsed_borders_for_row .collapsed_borders_for_row
.block_start .block_start
.get(child_index) .get(child_index)
.map_or(CollapsedBorder::new(), |x| *x), .map_or(CollapsedBorder::new(), |x| x.clone()),
block_end_border: border_collapse_info block_end_border: border_collapse_info
.collapsed_borders_for_row .collapsed_borders_for_row
.block_end .block_end
.get(child_index) .get(child_index)
.map_or(CollapsedBorder::new(), |x| *x), .map_or(CollapsedBorder::new(), |x| x.clone()),
inline_start_width: border_collapse_info inline_start_width: border_collapse_info
.collapsed_border_spacing_for_row .collapsed_border_spacing_for_row
.inline .inline

4
components/layout_2020/display_list/gradient.rs
View file

@ -275,11 +275,11 @@ fn fixup_stops(
for item in items { for item in items {
match item { match item {
GradientItem::SimpleColorStop(color) => stops.push(ColorStop { GradientItem::SimpleColorStop(color) => stops.push(ColorStop {
color: super::rgba(style.resolve_color(*color)), color: super::rgba(style.resolve_color(color.clone())),
position: None, position: None,
}), }),
GradientItem::ComplexColorStop { color, position } => stops.push(ColorStop { GradientItem::ComplexColorStop { color, position } => stops.push(ColorStop {
color: super::rgba(style.resolve_color(*color)), color: super::rgba(style.resolve_color(color.clone())),
position: Some(if gradient_line_length.px() == 0. { position: Some(if gradient_line_length.px() == 0. {
0. 0.
} else { } else {

19
components/layout_2020/display_list/mod.rs
View file

@ -352,7 +352,7 @@ impl Fragment {
let text_decoration_color = fragment let text_decoration_color = fragment
.parent_style .parent_style
.clone_text_decoration_color() .clone_text_decoration_color()
.to_rgba(color); .into_rgba(color);
let text_decoration_style = fragment.parent_style.clone_text_decoration_style(); let text_decoration_style = fragment.parent_style.clone_text_decoration_style();
if text_decoration_style == ComputedTextDecorationStyle::MozNone { if text_decoration_style == ComputedTextDecorationStyle::MozNone {
return; return;
@ -535,7 +535,7 @@ impl<'a> BuilderForBoxFragment<'a> {
let source = background::Source::Fragment; let source = background::Source::Fragment;
let style = &self.fragment.style; let style = &self.fragment.style;
let b = style.get_background(); let b = style.get_background();
let background_color = style.resolve_color(b.background_color); let background_color = style.resolve_color(b.background_color.clone());
if background_color.alpha > 0 { if background_color.alpha > 0 {
// https://drafts.csswg.org/css-backgrounds/#background-color // https://drafts.csswg.org/css-backgrounds/#background-color
// “The background color is clipped according to the background-clip // “The background color is clipped according to the background-clip
@ -685,10 +685,15 @@ impl<'a> BuilderForBoxFragment<'a> {
} }
let common = builder.common_properties(self.border_rect, &self.fragment.style); let common = builder.common_properties(self.border_rect, &self.fragment.style);
let details = wr::BorderDetails::Normal(wr::NormalBorder { let details = wr::BorderDetails::Normal(wr::NormalBorder {
top: self.build_border_side(border.border_top_style, border.border_top_color), top: self.build_border_side(border.border_top_style, border.border_top_color.clone()),
right: self.build_border_side(border.border_right_style, border.border_right_color), right: self
bottom: self.build_border_side(border.border_bottom_style, border.border_bottom_color), .build_border_side(border.border_right_style, border.border_right_color.clone()),
left: self.build_border_side(border.border_left_style, border.border_left_color), bottom: self.build_border_side(
border.border_bottom_style,
border.border_bottom_color.clone(),
),
left: self
.build_border_side(border.border_left_style, border.border_left_color.clone()),
radius: self.border_radius, radius: self.border_radius,
do_aa: true, do_aa: true,
}); });
@ -718,7 +723,7 @@ impl<'a> BuilderForBoxFragment<'a> {
OutlineStyle::Auto => BorderStyle::Solid, OutlineStyle::Auto => BorderStyle::Solid,
OutlineStyle::BorderStyle(s) => s, OutlineStyle::BorderStyle(s) => s,
}; };
let side = self.build_border_side(style, outline.outline_color); let side = self.build_border_side(style, outline.outline_color.clone());
let details = wr::BorderDetails::Normal(wr::NormalBorder { let details = wr::BorderDetails::Normal(wr::NormalBorder {
top: side, top: side,
right: side, right: side,

2
components/layout_2020/display_list/stacking_context.rs
View file

@ -404,7 +404,7 @@ impl StackingContext {
.union(&fragment_tree.scrollable_overflow) .union(&fragment_tree.scrollable_overflow)
.to_webrender(); .to_webrender();
let background_color = style.resolve_color(style.get_background().background_color); let background_color = style.resolve_color(style.get_background().background_color.clone());
if background_color.alpha > 0 { if background_color.alpha > 0 {
let common = builder.common_properties(painting_area, &style); let common = builder.common_properties(painting_area, &style);
let color = super::rgba(background_color); let color = super::rgba(background_color);

2
components/layout_2020/style_ext.rs
View file

@ -465,7 +465,7 @@ impl ComputedValuesExt for ComputedValues {
/// Whether or not this style specifies a non-transparent background. /// Whether or not this style specifies a non-transparent background.
fn background_is_transparent(&self) -> bool { fn background_is_transparent(&self) -> bool {
let background = self.get_background(); let background = self.get_background();
let color = self.resolve_color(background.background_color); let color = self.resolve_color(background.background_color.clone());
color.alpha == 0 && color.alpha == 0 &&
background background
.background_image .background_image

3
components/layout_thread/lib.rs
View file

@ -1796,7 +1796,8 @@ fn get_root_flow_background_color(flow: &mut dyn Flow) -> ColorF {
.fragment .fragment
.style .style
.get_background() .get_background()
.background_color, .background_color
.clone(),
); );
ColorF::new( ColorF::new(
color.red_f32(), color.red_f32(),

50
components/style/logical_geometry.rs
View file

@ -1055,6 +1055,18 @@ impl<T: Copy> LogicalMargin<T> {
} }
} }
#[inline]
pub fn convert(&self, mode_from: WritingMode, mode_to: WritingMode) -> LogicalMargin<T> {
if mode_from == mode_to {
self.debug_writing_mode.check(mode_from);
*self
} else {
LogicalMargin::from_physical(mode_to, self.to_physical(mode_from))
}
}
}
impl<T: Clone> LogicalMargin<T> {
#[inline] #[inline]
pub fn to_physical(&self, mode: WritingMode) -> SideOffsets2D<T> { pub fn to_physical(&self, mode: WritingMode) -> SideOffsets2D<T> {
self.debug_writing_mode.check(mode); self.debug_writing_mode.check(mode);
@ -1064,42 +1076,32 @@ impl<T: Copy> LogicalMargin<T> {
let left; let left;
if mode.is_vertical() { if mode.is_vertical() {
if mode.is_vertical_lr() { if mode.is_vertical_lr() {
left = self.block_start; left = self.block_start.clone();
right = self.block_end; right = self.block_end.clone();
} else { } else {
right = self.block_start; right = self.block_start.clone();
left = self.block_end; left = self.block_end.clone();
} }
if mode.is_inline_tb() { if mode.is_inline_tb() {
top = self.inline_start; top = self.inline_start.clone();
bottom = self.inline_end; bottom = self.inline_end.clone();
} else { } else {
bottom = self.inline_start; bottom = self.inline_start.clone();
top = self.inline_end; top = self.inline_end.clone();
} }
} else { } else {
top = self.block_start; top = self.block_start.clone();
bottom = self.block_end; bottom = self.block_end.clone();
if mode.is_bidi_ltr() { if mode.is_bidi_ltr() {
left = self.inline_start; left = self.inline_start.clone();
right = self.inline_end; right = self.inline_end.clone();
} else { } else {
right = self.inline_start; right = self.inline_start.clone();
left = self.inline_end; left = self.inline_end.clone();
} }
} }
SideOffsets2D::new(top, right, bottom, left) SideOffsets2D::new(top, right, bottom, left)
} }
#[inline]
pub fn convert(&self, mode_from: WritingMode, mode_to: WritingMode) -> LogicalMargin<T> {
if mode_from == mode_to {
self.debug_writing_mode.check(mode_from);
*self
} else {
LogicalMargin::from_physical(mode_to, self.to_physical(mode_from))
}
}
} }
impl<T: PartialEq + Zero> LogicalMargin<T> { impl<T: PartialEq + Zero> LogicalMargin<T> {