Remove old legacy style primitive code.

Author: gw3583

webrender/src/batch.rs

@@ -902,7 +902,6 @@ impl AlphaBatchBuilder {
                                 PrimitiveInstanceKind::Picture { pic_index } => pic_index,
                                 PrimitiveInstanceKind::LineDecoration { .. } |
                                 PrimitiveInstanceKind::TextRun { .. } |
-                                PrimitiveInstanceKind::LegacyPrimitive { .. } |
                                 PrimitiveInstanceKind::NormalBorder { .. } |
                                 PrimitiveInstanceKind::ImageBorder { .. } |
                                 PrimitiveInstanceKind::Rectangle { .. } |
@@ -1401,11 +1400,6 @@ impl AlphaBatchBuilder {
                     }
                 }
             }
-            (
-                PrimitiveInstanceKind::LegacyPrimitive { .. },
-                PrimitiveTemplateKind::Unused,
-            ) => {
-            }
             (
                 PrimitiveInstanceKind::ImageBorder { .. },
                 PrimitiveTemplateKind::ImageBorder { request, brush_segments, .. }
@@ -2306,7 +2300,6 @@ impl PrimitiveInstance {
                     _ => unreachable!(),
                 }
             }
-            PrimitiveInstanceKind::LegacyPrimitive { .. } |
             PrimitiveInstanceKind::Picture { .. } |
             PrimitiveInstanceKind::TextRun { .. } |
             PrimitiveInstanceKind::LineDecoration { .. } |

webrender/src/display_list_flattener.rs

@@ -844,13 +844,9 @@ impl<'a> DisplayListFlattener<'a> {
         spatial_node_index: SpatialNodeIndex,
         container: PrimitiveContainer,
     ) -> PrimitiveInstance {
-        // Build a primitive key, and optionally an old
-        // style PrimitiveDetails structure from the
-        // source primitive container.
+        // Build a primitive key.
         let mut info = info.clone();
-        let (prim_key_kind, prim_details) = container.build(
-            &mut info,
-        );
+        let prim_key_kind = container.build(&mut info);
 
         let prim_key = PrimitiveKey::new(
             info.is_backface_visible,
@@ -875,24 +871,7 @@ impl<'a> DisplayListFlattener<'a> {
                 }
             });
 
-        // If we are building an old style primitive, add it to
-        // the prim store, and create a primitive index for it.
-        // For an interned primitive, use the primitive key to
-        // create a matching primitive instance kind.
-        let instance_kind = match prim_details {
-            Some(prim_details) => {
-                let prim_index = self.prim_store.add_primitive(
-                    &info.rect,
-                    &info.clip_rect,
-                    prim_details,
-                );
-
-                PrimitiveInstanceKind::LegacyPrimitive { prim_index }
-            }
-            None => {
-                prim_key.to_instance_kind(&mut self.prim_store)
-            }
-        };
+        let instance_kind = prim_key.to_instance_kind(&mut self.prim_store);
 
         PrimitiveInstance::new(
             instance_kind,

webrender/src/frame_builder.rs

@@ -338,7 +338,7 @@ impl FrameBuilder {
         let mut profile_counters = FrameProfileCounters::new();
         profile_counters
             .total_primitives
-            .set(self.prim_store.prim_count());
+            .set(self.prim_store.prim_count);
 
         resource_cache.begin_frame(stamp);
         gpu_cache.begin_frame(stamp.frame_id());

webrender/src/picture.rs

@@ -441,7 +441,6 @@ impl TileCache {
                     }
                 }
             }
-            PrimitiveInstanceKind::LegacyPrimitive { .. } |
             PrimitiveInstanceKind::TextRun { .. } |
             PrimitiveInstanceKind::LineDecoration { .. } |
             PrimitiveInstanceKind::Clear |