Further changes required by Servo

1 files changed, 14 insertions, 14 deletions

diff --git a/components/layout/table_row.rs b/components/layout/table_row.rs
index 0d959b7456c..b9090c39c94 100644
--- a/components/layout/table_row.rs
+++ b/components/layout/table_row.rs
@@ -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.
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Debug)]
 pub struct CollapsedBorder {
     /// The style of the border.
     pub style: BorderStyle,
@@ -771,7 +771,7 @@ impl CollapsedBorder {
         CollapsedBorder {
             style: css_style.get_border().border_top_style,
             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,
         }
     }
@@ -782,7 +782,7 @@ impl CollapsedBorder {
         CollapsedBorder {
             style: css_style.get_border().border_right_style,
             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,
         }
     }
@@ -796,7 +796,7 @@ impl CollapsedBorder {
         CollapsedBorder {
             style: css_style.get_border().border_bottom_style,
             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,
         }
     }
@@ -807,7 +807,7 @@ impl CollapsedBorder {
         CollapsedBorder {
             style: css_style.get_border().border_left_style,
             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,
         }
     }
@@ -883,18 +883,18 @@ impl CollapsedBorder {
         match (self.style, other.style) {
             // Step 1.
             (BorderStyle::Hidden, _) => {},
-            (_, BorderStyle::Hidden) => *self = *other,
+            (_, BorderStyle::Hidden) => *self = other.clone(),
             // Step 2.
-            (BorderStyle::None, _) => *self = *other,
+            (BorderStyle::None, _) => *self = other.clone(),
             (_, BorderStyle::None) => {},
             // Step 3.
             _ 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 => *self = *other,
+            (this_style, other_style) if this_style < other_style => *self = other.clone(),
             // Step 4.
             _ 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
                     .inline
                     .get(child_index)
-                    .map_or(CollapsedBorder::new(), |x| *x),
+                    .map_or(CollapsedBorder::new(), |x| x.clone()),
                 inline_end_border: border_collapse_info
                     .collapsed_borders_for_row
                     .inline
                     .get(child_index + 1)
-                    .map_or(CollapsedBorder::new(), |x| *x),
+                    .map_or(CollapsedBorder::new(), |x| x.clone()),
                 block_start_border: border_collapse_info
                     .collapsed_borders_for_row
                     .block_start
                     .get(child_index)
-                    .map_or(CollapsedBorder::new(), |x| *x),
+                    .map_or(CollapsedBorder::new(), |x| x.clone()),
                 block_end_border: border_collapse_info
                     .collapsed_borders_for_row
                     .block_end
                     .get(child_index)
-                    .map_or(CollapsedBorder::new(), |x| *x),
+                    .map_or(CollapsedBorder::new(), |x| x.clone()),
                 inline_start_width: border_collapse_info
                     .collapsed_border_spacing_for_row
                     .inline