4 files changed, 8 insertions, 8 deletions
diff --git a/components/layout/construct.rs b/components/layout/construct.rs
index c17d52dd155..c3ebed7d1a3 100644
--- a/components/layout/construct.rs
+++ b/components/layout/construct.rs
@@ -2068,7 +2068,7 @@ impl FlowRef {
     /// All flows must be finished at some point, or they will not have their intrinsic inline-sizes
     /// properly computed. (This is not, however, a memory safety problem.)
     fn finish(&mut self) {
-        if !opts::get().bubble_inline_sizes_separately {
+        if !opts::get().debug.bubble_inline_sizes_separately {
             FlowRef::deref_mut(self).bubble_inline_sizes();
             FlowRef::deref_mut(self)
                 .mut_base()
diff --git a/components/layout/display_list/builder.rs b/components/layout/display_list/builder.rs
index 4b6aa8e7371..1b53ac90249 100644
--- a/components/layout/display_list/builder.rs
+++ b/components/layout/display_list/builder.rs
@@ -1713,7 +1713,7 @@ impl Fragment {
             );
         });
 
-        if opts::get().show_debug_fragment_borders {
+        if opts::get().debug.show_fragment_borders {
             self.build_debug_borders_around_fragment(state, stacking_relative_border_box, clip)
         }
     }
@@ -1772,7 +1772,7 @@ impl Fragment {
                     clip,
                 );
 
-                if opts::get().show_debug_fragment_borders {
+                if opts::get().debug.show_fragment_borders {
                     self.build_debug_borders_around_text_fragments(
                         state,
                         self.style(),
@@ -1793,7 +1793,7 @@ impl Fragment {
                     clip,
                 );
 
-                if opts::get().show_debug_fragment_borders {
+                if opts::get().debug.show_fragment_borders {
                     self.build_debug_borders_around_text_fragments(
                         state,
                         self.style(),
@@ -1817,7 +1817,7 @@ impl Fragment {
             SpecificFragmentInfo::InlineAbsolute(_) |
             SpecificFragmentInfo::TruncatedFragment(_) |
             SpecificFragmentInfo::Svg(_) => {
-                if opts::get().show_debug_fragment_borders {
+                if opts::get().debug.show_fragment_borders {
                     self.build_debug_borders_around_fragment(
                         state,
                         stacking_relative_border_box,
@@ -2885,7 +2885,7 @@ impl BaseFlow {
         state: &mut DisplayListBuildState,
         node: OpaqueNode,
     ) {
-        if !opts::get().show_debug_parallel_layout {
+        if !opts::get().debug.show_parallel_layout {
             return;
         }
 
diff --git a/components/layout/parallel.rs b/components/layout/parallel.rs
index 4ad10b3db11..a5a4a51a5f3 100644
--- a/components/layout/parallel.rs
+++ b/components/layout/parallel.rs
@@ -196,7 +196,7 @@ pub fn reflow(
     context: &LayoutContext,
     queue: &rayon::ThreadPool,
 ) {
-    if opts::get().bubble_inline_sizes_separately {
+    if opts::get().debug.bubble_inline_sizes_separately {
         let bubble_inline_sizes = BubbleISizes {
             layout_context: &context,
         };
diff --git a/components/layout/sequential.rs b/components/layout/sequential.rs
index 39e6ce4662f..9de4dada75b 100644
--- a/components/layout/sequential.rs
+++ b/components/layout/sequential.rs
@@ -55,7 +55,7 @@ pub fn reflow(root: &mut dyn Flow, layout_context: &LayoutContext, relayout_mode
         }
     }
 
-    if opts::get().bubble_inline_sizes_separately {
+    if opts::get().debug.bubble_inline_sizes_separately {
         let bubble_inline_sizes = BubbleISizes {
             layout_context: &layout_context,
         };