diff --git a/components/style/properties/gecko.mako.rs b/components/style/properties/gecko.mako.rs
index e8f2c521a6f..dc0ceceefa1 100644
--- a/components/style/properties/gecko.mako.rs
+++ b/components/style/properties/gecko.mako.rs
@@ -2599,18 +2599,7 @@ clip-path
 </%self:impl_trait>
 
 <%self:impl_trait style_struct_name="InheritedSVG"
-                  skip_longhands="paint-order stroke-dasharray">
-    pub fn set_paint_order(&mut self, v: longhands::paint_order::computed_value::T) {
-        self.gecko.mPaintOrder = v.0;
-    }
-
-    ${impl_simple_copy('paint_order', 'mPaintOrder')}
-
-    pub fn clone_paint_order(&self) -> longhands::paint_order::computed_value::T {
-        use crate::properties::longhands::paint_order::computed_value::T;
-        T(self.gecko.mPaintOrder)
-    }
-
+                  skip_longhands="stroke-dasharray">
     pub fn set_stroke_dasharray(&mut self, v: longhands::stroke_dasharray::computed_value::T) {
         use crate::gecko_bindings::structs::nsStyleSVG_STROKE_DASHARRAY_CONTEXT as CONTEXT_VALUE;
         use crate::values::generics::svg::SVGStrokeDashArray;
diff --git a/components/style/values/specified/svg.rs b/components/style/values/specified/svg.rs
index 4858fbaec6b..6ae1eac2d4a 100644
--- a/components/style/values/specified/svg.rs
+++ b/components/style/values/specified/svg.rs
@@ -106,13 +106,13 @@ pub enum PaintOrder {
 }
 
 /// Number of non-normal components
-const PAINT_ORDER_COUNT: u8 = 3;
+pub const PAINT_ORDER_COUNT: u8 = 3;
 
 /// Number of bits for each component
-const PAINT_ORDER_SHIFT: u8 = 2;
+pub const PAINT_ORDER_SHIFT: u8 = 2;
 
 /// Mask with above bits set
-const PAINT_ORDER_MASK: u8 = 0b11;
+pub const PAINT_ORDER_MASK: u8 = 0b11;
 
 /// The specified value is tree `PaintOrder` values packed into the
 /// bitfields below, as a six-bit field, of 3 two-bit pairs
@@ -135,6 +135,7 @@ const PAINT_ORDER_MASK: u8 = 0b11;
     ToResolvedValue,
     ToShmem,
 )]
+#[repr(transparent)]
 pub struct SVGPaintOrder(pub u8);
 
 impl SVGPaintOrder {
@@ -146,7 +147,7 @@ impl SVGPaintOrder {
     /// Get variant of `paint-order`
     pub fn order_at(&self, pos: u8) -> PaintOrder {
         // Safe because PaintOrder covers all possible patterns.
-        unsafe { ::std::mem::transmute((self.0 >> pos * PAINT_ORDER_SHIFT) & PAINT_ORDER_MASK) }
+        unsafe { std::mem::transmute((self.0 >> pos * PAINT_ORDER_SHIFT) & PAINT_ORDER_MASK) }
     }
 }