Remove PrimitiveContainer

Author: gw3583

webrender/src/border.rs

@@ -11,7 +11,7 @@ use euclid::vec2;
 use display_list_flattener::DisplayListFlattener;
 use gpu_types::{BorderInstance, BorderSegment, BrushFlags};
 use prim_store::{BorderSegmentInfo, BrushSegment, NinePatchDescriptor};
-use prim_store::{EdgeAaSegmentMask, PrimitiveContainer, ScrollNodeAndClipChain};
+use prim_store::{EdgeAaSegmentMask, ScrollNodeAndClipChain, PrimitiveKeyKind};
 use util::{lerp, RectHelpers};
 
 // Using 2048 as the maximum radius in device space before which we
@@ -117,6 +117,18 @@ pub struct NormalBorderAu {
     pub do_aa: bool,
 }
 
+impl NormalBorderAu {
+    // Construct a border based upon self with color
+    pub fn with_color(&self, color: ColorU) -> Self {
+        let mut b = self.clone();
+        b.left.color = color;
+        b.right.color = color;
+        b.top.color = color;
+        b.bottom.color = color;
+        b
+    }
+}
+
 impl From<NormalBorder> for NormalBorderAu {
     fn from(border: NormalBorder) -> Self {
         NormalBorderAu {
@@ -217,9 +229,9 @@ impl<'a> DisplayListFlattener<'a> {
             clip_and_scroll,
             info,
             Vec::new(),
-            PrimitiveContainer::NormalBorder {
-                border,
-                widths,
+            PrimitiveKeyKind::NormalBorder {
+                border: border.into(),
+                widths: widths.to_au(),
             },
         );
     }

webrender/src/box_shadow.rs

@@ -8,8 +8,7 @@ use clip::ClipItemKey;
 use display_list_flattener::DisplayListFlattener;
 use gpu_cache::GpuCacheHandle;
 use gpu_types::BoxShadowStretchMode;
-use prim_store::PrimitiveContainer;
-use prim_store::ScrollNodeAndClipChain;
+use prim_store::{ScrollNodeAndClipChain, PrimitiveKeyKind};
 use render_task::RenderTaskCacheEntryHandle;
 use util::RectHelpers;
 
@@ -73,7 +72,7 @@ impl<'a> DisplayListFlattener<'a> {
         clip_and_scroll: ScrollNodeAndClipChain,
         prim_info: &LayoutPrimitiveInfo,
         box_offset: &LayoutVector2D,
-        color: &ColorF,
+        color: ColorF,
         mut blur_radius: f32,
         spread_radius: f32,
         border_radius: BorderRadius,
@@ -149,8 +148,8 @@ impl<'a> DisplayListFlattener<'a> {
                 clip_and_scroll,
                 &LayoutPrimitiveInfo::with_clip_rect(final_prim_rect, prim_info.clip_rect),
                 clips,
-                PrimitiveContainer::Rectangle {
-                    color: *color,
+                PrimitiveKeyKind::Rectangle {
+                    color: color.into(),
                 },
             );
         } else {
@@ -172,8 +171,8 @@ impl<'a> DisplayListFlattener<'a> {
 
             // Draw the box-shadow as a solid rect, using a box-shadow
             // clip mask item.
-            let prim = PrimitiveContainer::Rectangle {
-                color: *color,
+            let prim = PrimitiveKeyKind::Rectangle {
+                color: color.into(),
             };
 
             // Create the box-shadow clip item.