Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Let resolve_color() take its parameter by reference (#35247)

Browse source 
Bumps Stylo to https://github.com/servo/stylo/pull/116

This way the callers don't have to clone it if they don't have ownership
or want to use the value later.

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2025-01-31 15:34:40 -08:00 • committed by GitHub
parent 7edbafb91b
commit 3122de08f3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 34 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -346,11 +346,11 @@ fn conic_gradient_items_to_color_stops(
.filter_map(|item| {
match item {
GradientItem::SimpleColorStop(color) => Some(ColorStop {
color: super::rgba(style.resolve_color(color.clone())),
color: super::rgba(style.resolve_color(color)),
position: None,
}),
GradientItem::ComplexColorStop { color, position } => Some(ColorStop {
color: super::rgba(style.resolve_color(color.clone())),
color: super::rgba(style.resolve_color(color)),
position: match position {
AngleOrPercentage::Percentage(percentage) => Some(percentage.0),
AngleOrPercentage::Angle(angle) => Some(angle.degrees() / 360.),
@ -384,11 +384,11 @@ fn gradient_items_to_color_stops(
.filter_map(|item| {
match item {
GradientItem::SimpleColorStop(color) => Some(ColorStop {
color: super::rgba(style.resolve_color(color.clone())),
color: super::rgba(style.resolve_color(color)),
position: None,
}),
GradientItem::ComplexColorStop { color, position } => Some(ColorStop {
color: super::rgba(style.resolve_color(color.clone())),
color: super::rgba(style.resolve_color(color)),
position: Some(if gradient_line_length.is_zero() {
0.
} else {

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

@ -708,7 +708,7 @@ impl<'a> BuilderForBoxFragment<'a> {
painter: &BackgroundPainter,
) {
let b = painter.style.get_background();
let background_color = painter.style.resolve_color(b.background_color.clone());
let background_color = painter.style.resolve_color(&b.background_color);
if background_color.alpha > 0.0 {
// https://drafts.csswg.org/css-backgrounds/#background-color
// “The background color is clipped according to the background-clip
@ -1119,7 +1119,7 @@ impl<'a> BuilderForBoxFragment<'a> {
};
let side = self.build_border_side(BorderStyleColor {
style: border_style,
color: style.resolve_color(outline.outline_color.clone()),
color: style.resolve_color(&outline.outline_color),
});
let details = wr::BorderDetails::Normal(wr::NormalBorder {
top: side,
@ -1156,11 +1156,7 @@ impl<'a> BuilderForBoxFragment<'a> {
box_shadow.base.horizontal.px(),
box_shadow.base.vertical.px(),
),
rgba(
self.fragment
.style
.resolve_color(box_shadow.base.color.clone()),
),
rgba(self.fragment.style.resolve_color(&box_shadow.base.color)),
box_shadow.base.blur.px(),
box_shadow.spread.px(),
self.border_radius,

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

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