Remove role applications

4 files changed, 9 insertions, 37 deletions

diff --git a/library/src/layout/flow.rs b/library/src/layout/flow.rs
index cc5dcd50..822d2c38 100644
--- a/library/src/layout/flow.rs
+++ b/library/src/layout/flow.rs
@@ -207,10 +207,7 @@ impl<'a> FlowLayouter<'a> {
 
         let frames = block.layout_block(world, &self.regions, styles)?;
         let len = frames.len();
-        for (i, mut frame) in frames.into_iter().enumerate() {
-            // Set the generic block role.
-            frame.apply_role(Role::GenericBlock);
-
+        for (i, frame) in frames.into_iter().enumerate() {
             // Grow our size, shrink the region and save the frame for later.
             let size = frame.size();
             self.used.y += size.y;
diff --git a/library/src/layout/grid.rs b/library/src/layout/grid.rs
index 8af69b9a..7f58090b 100644
--- a/library/src/layout/grid.rs
+++ b/library/src/layout/grid.rs
@@ -481,14 +481,6 @@ impl<'a> GridLayouter<'a> {
 
                 let pod = Regions::one(size, base, Axes::splat(true));
                 let frame = cell.layout_block(self.world, &pod, self.styles)?.remove(0);
-                match frame.role() {
-                    Some(Role::ListLabel | Role::ListItemBody) => {
-                        output.apply_role(Role::ListItem)
-                    }
-                    Some(Role::TableCell) => output.apply_role(Role::TableRow),
-                    _ => {}
-                }
-
                 output.push_frame(pos, frame);
             }
 
@@ -530,13 +522,6 @@ impl<'a> GridLayouter<'a> {
                 // Push the layouted frames into the individual output frames.
                 let frames = cell.layout_block(self.world, &pod, self.styles)?;
                 for (output, frame) in outputs.iter_mut().zip(frames) {
-                    match frame.role() {
-                        Some(Role::ListLabel | Role::ListItemBody) => {
-                            output.apply_role(Role::ListItem)
-                        }
-                        Some(Role::TableCell) => output.apply_role(Role::TableRow),
-                        _ => {}
-                    }
                     output.push_frame(pos, frame);
                 }
             }
diff --git a/library/src/layout/page.rs b/library/src/layout/page.rs
index c308571c..6a0a3dfd 100644
--- a/library/src/layout/page.rs
+++ b/library/src/layout/page.rs
@@ -110,23 +110,16 @@ impl PageNode {
             let pad = padding.resolve(styles).relative_to(size);
             let pw = size.x - pad.left - pad.right;
             let py = size.y - pad.bottom;
-            for (role, marginal, pos, area) in [
-                (Role::Header, header, Point::with_x(pad.left), Size::new(pw, pad.top)),
-                (
-                    Role::Footer,
-                    footer,
-                    Point::new(pad.left, py),
-                    Size::new(pw, pad.bottom),
-                ),
-                (Role::Foreground, foreground, Point::zero(), size),
-                (Role::Background, background, Point::zero(), size),
+            for (marginal, pos, area) in [
+                (header, Point::with_x(pad.left), Size::new(pw, pad.top)),
+                (footer, Point::new(pad.left, py), Size::new(pw, pad.bottom)),
+                (foreground, Point::zero(), size),
+                (background, Point::zero(), size),
             ] {
                 if let Some(content) = marginal.resolve(world, page)? {
                     let pod = Regions::one(area, area, Axes::splat(true));
-                    let mut sub = content.layout_block(world, &pod, styles)?.remove(0);
-                    sub.apply_role(role);
-
-                    if role == Role::Background {
+                    let sub = content.layout_block(world, &pod, styles)?.remove(0);
+                    if std::ptr::eq(marginal, background) {
                         frame.prepend_frame(pos, sub);
                     } else {
                         frame.push_frame(pos, sub);
diff --git a/library/src/layout/stack.rs b/library/src/layout/stack.rs
index ec1063fd..02129e1f 100644
--- a/library/src/layout/stack.rs
+++ b/library/src/layout/stack.rs
@@ -198,10 +198,7 @@ impl<'a> StackLayouter<'a> {
 
         let frames = block.layout_block(world, &self.regions, styles)?;
         let len = frames.len();
-        for (i, mut frame) in frames.into_iter().enumerate() {
-            // Set the generic block role.
-            frame.apply_role(Role::GenericBlock);
-
+        for (i, frame) in frames.into_iter().enumerate() {
             // Grow our size, shrink the region and save the frame for later.
             let size = frame.size();
             let size = match self.axis {