From 00945605417217c11ab8ce159083a07034118c90 Mon Sep 17 00:00:00 2001
From: Oriol Brufau <obrufau@igalia.com>
Date: Mon, 20 Nov 2023 19:14:56 +0100
Subject: [PATCH] Further changes required by Servo

---
 components/layout/display_list/conversions.rs      | 2 +-
 components/layout_2020/display_list/conversions.rs | 2 +-
 components/layout_2020/display_list/mod.rs         | 2 +-
 components/script/canvas_state.rs                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/layout/display_list/conversions.rs b/components/layout/display_list/conversions.rs
index c4f6dc5f04b..69c68951e7b 100644
--- a/components/layout/display_list/conversions.rs
+++ b/components/layout/display_list/conversions.rs
@@ -62,7 +62,7 @@ impl FilterToLayout for Filter {
                 color: shadow
                     .color
                     .clone()
-                    .resolve_into_absolute(current_color)
+                    .resolve_to_absolute(current_color)
                     .to_layout(),
             }),
             // Statically check that Url is impossible.
diff --git a/components/layout_2020/display_list/conversions.rs b/components/layout_2020/display_list/conversions.rs
index 3159fc820a2..a0434422f9d 100644
--- a/components/layout_2020/display_list/conversions.rs
+++ b/components/layout_2020/display_list/conversions.rs
@@ -37,7 +37,7 @@ impl FilterToWebRender for ComputedFilter {
             ComputedFilter::DropShadow(ref shadow) => FilterOp::DropShadow(Shadow {
                 blur_radius: shadow.blur.px(),
                 offset: units::LayoutVector2D::new(shadow.horizontal.px(), shadow.vertical.px()),
-                color: super::rgba(shadow.color.clone().resolve_into_absolute(current_color)),
+                color: super::rgba(shadow.color.clone().resolve_to_absolute(current_color)),
             }),
             // Statically check that Url is impossible.
             ComputedFilter::Url(ref url) => match *url {},
diff --git a/components/layout_2020/display_list/mod.rs b/components/layout_2020/display_list/mod.rs
index db8e5fcf401..57bc6100cd8 100644
--- a/components/layout_2020/display_list/mod.rs
+++ b/components/layout_2020/display_list/mod.rs
@@ -368,7 +368,7 @@ impl Fragment {
         let text_decoration_color = fragment
             .parent_style
             .clone_text_decoration_color()
-            .resolve_into_absolute(color);
+            .resolve_to_absolute(color);
         let text_decoration_style = fragment.parent_style.clone_text_decoration_style();
         if text_decoration_style == ComputedTextDecorationStyle::MozNone {
             return;
diff --git a/components/script/canvas_state.rs b/components/script/canvas_state.rs
index 31dee618d4a..95d79891f5d 100644
--- a/components/script/canvas_state.rs
+++ b/components/script/canvas_state.rs
@@ -1708,7 +1708,7 @@ pub fn parse_color(canvas: Option<&HTMLCanvasElement>, string: &str) -> Result<R
             };
 
             let rgba = color
-                .resolve_into_absolute(&current_color)
+                .resolve_to_absolute(&current_color)
                 .to_color_space(ColorSpace::Srgb);
             Ok(RGBA::from_floats(
                 Some(rgba.components.0),