servo · Loirooriol · Aug 16, 2023 · Jun 18, 2023 · Jun 18, 2023 · Jun 18, 2023
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/atoms/static_atoms.txt b/components/atoms/static_atoms.txt
@@ -1,3  1,4 @@
 -moz-content-preferred-color-scheme
 -moz-gtk-csd-close-button-position
 -moz-gtk-csd-maximize-button-position
 -moz-gtk-csd-menu-radius
@@ -12,7  13,9 @@ animationcancel
 animationend
 animationiteration
 animationstart
 aspect-ratio
 beforeunload
 block-size
 button
 canplay
 canplaythrough
@@ -50,11  53,13 @@ fullscreenchange
 fullscreenerror
 gattserverdisconnected
 hashchange
 height
 hidden
 icecandidate
 iceconnectionstatechange
 icegatheringstatechange
 image
 inline-size
 input
 inputsourceschange
 invalid
@@ -82,6  87,7 @@ none
 number
 onchange
 open
 orientation
 pagehide
 pageshow
 password

diff --git a/components/derive_common/cg.rs b/components/derive_common/cg.rs
@@ -373,6  373,11 @@ pub fn to_css_identifier(mut camel_case: &str) -> String {
     result
 }
 
 /// Transforms foo-bar to FOO_BAR.
 pub fn to_scream_case(css_case: &str) -> String {
     css_case.to_uppercase().replace('-', "_")
 }
 
 /// Given "FooBar", returns "Foo" and sets `camel_case` to "Bar".
 fn split_camel_segment<'input>(camel_case: &mut &'input str) -> Option<&'input str> {
     let index = match camel_case.chars().next() {

diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
@@ -44,6  44,7 @@ servo_atoms = { path = "../atoms" }
 servo_config = { path = "../config" }
 servo_geometry = { path = "../geometry" }
 servo_url = { path = "../url" }
 size_of_test = { path = "../size_of_test" }
 smallvec = { workspace = true, features = ["union"] }
 style = { path = "../style", features = ["servo"] }
 style_traits = { path = "../style_traits" }
@@ -52,6  53,3 @@ unicode-script = { workspace = true }
 webrender_api = { workspace = true }
 xi-unicode = { workspace = true }
 
-[dev-dependencies]
-size_of_test = { path = "../size_of_test" }
-
diff --git a/components/layout/display_list/builder.rs b/components/layout/display_list/builder.rs
@@ -653,7  653,7 @@ impl Fragment {
         absolute_bounds: Rect<Au>,
     ) {
         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
         // backgrounds
         self.build_display_list_for_background_if_applicable_with_background(
@@ -1037,7  1037,9 @@ impl Fragment {
                 webrender_api::BoxShadowDisplayItem {
                     common: items::empty_common_item_properties(),
                     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(
                         box_shadow.base.horizontal.px(),
                         box_shadow.base.vertical.px(),
@@ -1083,10  1085,10 @@ impl Fragment {
 
         let border_style_struct = style.get_border();
         let mut colors = SideOffsets2D::new(
-            border_style_struct.border_top_color,
-            border_style_struct.border_right_color,
-            border_style_struct.border_bottom_color,
-            border_style_struct.border_left_color,
             border_style_struct.border_top_color.clone(),
             border_style_struct.border_right_color.clone(),
             border_style_struct.border_bottom_color.clone(),
             border_style_struct.border_left_color.clone(),
         );
         let mut border_style = SideOffsets2D::new(
             border_style_struct.border_top_style,
@@ -1316,7  1318,7 @@ impl Fragment {
 
         // Append the outline to the display list.
         let color = style
-            .resolve_color(style.get_outline().outline_color)
             .resolve_color(style.get_outline().outline_color.clone())
             .to_layout();
         let base = state.create_base_display_item(
             clip,
@@ -1451,7  1453,8 @@ impl Fragment {
         // TODO: Allow non-text fragments to be selected too.
         if scanned_text_fragment_info.selected() {
             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(
                 stacking_relative_border_box,
                 self.node,
@@ -2055,7  2058,7 @@ impl Fragment {
                     base: base.clone(),
                     shadow: webrender_api::Shadow {
                         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(),
                     },
                 },

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

diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs
@@ -158,6  158,11 @@ pub struct Fragment {
     pub established_reference_frame: Option<ClipScrollNodeIndex>,
 }
 
 #[cfg(debug_assertions)]
 size_of_test!(Fragment, 176);
 #[cfg(not(debug_assertions))]
 size_of_test!(Fragment, 152);
 
 impl Serialize for Fragment {
     fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
         let mut serializer = serializer.serialize_struct("fragment", 3)?;
@@ -212,6  217,8 @@ pub enum SpecificFragmentInfo {
     TruncatedFragment(Box<TruncatedFragmentInfo>),
 }
 
 size_of_test!(SpecificFragmentInfo, 24);
 
 impl SpecificFragmentInfo {
     fn restyle_damage(&self) -> RestyleDamage {
         let flow = match *self {

diff --git a/components/layout/lib.rs b/components/layout/lib.rs
@@ -16,6  16,8 @@ extern crate log;
 extern crate range;
 #[macro_use]
 extern crate serde;
 #[macro_use]
 extern crate size_of_test;
 
 #[macro_use]
 pub mod layout_debug;

diff --git a/components/layout/query.rs b/components/layout/query.rs
@@ -860,7  860,7 @@ where
                 shared: &context.style_context,
                 thread_local: &mut tlc,
             };
-            let styles = resolve_style(&mut context, element, RuleInclusion::All, None);
             let styles = resolve_style(&mut context, element, RuleInclusion::All, None, None);
             styles.primary().clone()
         }
     } else {
@@ -916,7  916,13 @@ pub fn process_resolved_style_request<'dom>(
         thread_local: &mut tlc,
     };
 
-    let styles = resolve_style(&mut context, element, RuleInclusion::All, pseudo.as_ref());
     let styles = resolve_style(
         &mut context,
         element,
         RuleInclusion::All,
         pseudo.as_ref(),
         None,
     );
     let style = styles.primary();
     let longhand_id = match *property {
         PropertyId::LonghandAlias(id, _) | PropertyId::Longhand(id) => id,

diff --git a/components/layout/table.rs b/components/layout/table.rs
@@ -794,7  794,7 @@ fn perform_border_collapse_for_row(
         child_table_row
             .final_collapsed_borders
             .inline
-            .push_or_set(i, *this_inline_border);
             .push_or_set(i, this_inline_border.clone());
         if i == 0 {
             child_table_row.final_collapsed_borders.inline[i].combine(&table_inline_borders.start);
         } 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]);
                 }
             },
-            PreviousBlockCollapsedBorders::FromTable(table_border) => {
             PreviousBlockCollapsedBorders::FromTable(ref table_border) => {
                 this_border.combine(&table_border);
             },
         }
@@ -837,7  837,7 @@ fn perform_border_collapse_for_row(
         .iter()
         .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 {
             NextBlockCollapsedBorders::FromNextRow(next_block_borders) => {
                 if next_block_borders.len() > i {
@@ -1358,7  1358,7 @@ impl<'table> TableCellStyleInfo<'table> {
                 if background as *const Background == initial.get_background() as *const _ {
                     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(
                     state,
                     background,

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