Add style field to render them in RenderContext

servo · Sep 10, 2013 · 03fb29e · 03fb29e
1 parent 0b0755b
commit 03fb29e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 deletions.
diff --git a/src/components/gfx/display_list.rs b/src/components/gfx/display_list.rs
@@ -16,6 +16,7 @@
 
 use color::Color;
 use geometry::Au;
+use newcss::values::CSSBorderStyle;
 use render_context::RenderContext;
 use text::SendableTextRun;
 
@@ -103,8 +104,11 @@ pub struct BorderDisplayItem<E> {
     /// The border widths
     border: SideOffsets2D<Au>,
 
-    /// The color of the border.
+    /// The border colors.
     color: SideOffsets2D<Color>,
+
+    /// The border styles.
+    style: SideOffsets2D<CSSBorderStyle>
 }
 
 impl<E> DisplayItem<E> {
@@ -151,7 +155,8 @@ impl<E> DisplayItem<E> {
             BorderDisplayItemClass(ref border) => {
                 render_context.draw_border(&border.base.bounds,
                                            border.border,
-                                           border.color)
+                                           border.color,
+                                           border.style)
             }
         }
     }

diff --git a/src/components/main/layout/box.rs b/src/components/main/layout/box.rs
@@ -27,6 +27,7 @@ use newcss::color::rgb;
 use newcss::complete::CompleteStyle;
 use newcss::units::{Em, Px};
 use newcss::units::{Cursive, Fantasy, Monospace, SansSerif, Serif};
+use newcss::values::{CSSBorderStyleDashed, CSSBorderStyleSolid};
 use newcss::values::{CSSClearNone, CSSClearLeft, CSSClearRight, CSSClearBoth};
 use newcss::values::{CSSFontFamilyFamilyName, CSSFontFamilyGenericFamily};
 use newcss::values::{CSSFontSizeLength, CSSFontStyleItalic, CSSFontStyleNormal};
@@ -637,7 +638,8 @@ impl RenderBox {
                                 extra: ExtraDisplayListData::new(*self),
                             },
                             border: debug_border,
-                            color: SideOffsets2D::new_all_same(rgb(0, 0, 200).to_gfx_color())
+                            color: SideOffsets2D::new_all_same(rgb(0, 0, 200).to_gfx_color()),
+                            style: SideOffsets2D::new_all_same(CSSBorderStyleSolid)
 
                         };
                         list.append_item(BorderDisplayItemClass(border_display_item))
@@ -658,7 +660,8 @@ impl RenderBox {
                                 extra: ExtraDisplayListData::new(*self),
                             },
                             border: debug_border,
-                            color: SideOffsets2D::new_all_same(rgb(0, 200, 0).to_gfx_color())
+                            color: SideOffsets2D::new_all_same(rgb(0, 200, 0).to_gfx_color()),
+                            style: SideOffsets2D::new_all_same(CSSBorderStyleDashed)
 
                         };
                         list.append_item(BorderDisplayItemClass(border_display_item))
@@ -684,7 +687,8 @@ impl RenderBox {
                                 extra: ExtraDisplayListData::new(*self),
                             },
                             border: debug_border,
-                            color: SideOffsets2D::new_all_same(rgb(0, 0, 200).to_gfx_color())
+                            color: SideOffsets2D::new_all_same(rgb(0, 0, 200).to_gfx_color()),
+                            style: SideOffsets2D::new_all_same(CSSBorderStyleSolid)
 
                         };
                         list.append_item(BorderDisplayItemClass(border_display_item))
@@ -915,11 +919,8 @@ impl RenderBox {
             return
         }
 
-        let top_color = self.style().border_top_color();
-        let right_color = self.style().border_right_color();
-        let bottom_color = self.style().border_bottom_color();
-        let left_color = self.style().border_left_color();
-
+        let (top_color, right_color, bottom_color, left_color) = (self.style().border_top_color(), self.style().border_right_color(), self.style().border_bottom_color(), self.style().border_left_color());
+        let (top_style, right_style, bottom_style, left_style) = (self.style().border_top_style(), self.style().border_right_style(), self.style().border_bottom_style(), self.style().border_left_style());
         // Append the border to the display list.
         do list.with_mut_ref |list| {
             let border_display_item = ~BorderDisplayItem {
@@ -932,9 +933,13 @@ impl RenderBox {
                                            border.bottom,
                                            border.left),
                 color: SideOffsets2D::new(top_color.to_gfx_color(),
-                                        right_color.to_gfx_color(),
-                                        bottom_color.to_gfx_color(),
-                                        left_color.to_gfx_color())
+                                          right_color.to_gfx_color(),
+                                          bottom_color.to_gfx_color(),
+                                          left_color.to_gfx_color()),
+                style: SideOffsets2D::new(top_style,
+                                          right_style,
+                                          bottom_style,
+                                          left_style)
             };
 
             list.append_item(BorderDisplayItemClass(border_display_item))