diff --git a/components/layout/display_list/builder.rs b/components/layout/display_list/builder.rs
index d076bd42d81..6feb85f5b6d 100644
--- a/components/layout/display_list/builder.rs
+++ b/components/layout/display_list/builder.rs
@@ -17,7 +17,7 @@ use context::LayoutContext;
 use display_list::ToLayout;
 use display_list::background::{build_border_radius, build_image_border_details};
 use display_list::background::{calculate_inner_border_radii, compute_background_placement};
-use display_list::background::{convert_radial_gradient, convert_linear_gradient};
+use display_list::background::{convert_linear_gradient, convert_radial_gradient};
 use display_list::background::{get_cyclic, simple_normal_border};
 use display_list::items::{BaseDisplayItem, BorderDetails, BorderDisplayItem, BLUR_INFLATION_FACTOR};
 use display_list::items::{BoxShadowDisplayItem, ClipScrollNode};
@@ -547,6 +547,13 @@ impl<'a> DisplayListBuildState<'a> {
             list.push(item);
         }
     }
+
+    fn clipping_and_scrolling_scope<R, F: FnOnce(&mut Self) -> R>(&mut self, function: F) -> R {
+        let previous_clipping_and_scrolling = self.current_clipping_and_scrolling;
+        let ret = function(self);
+        self.current_clipping_and_scrolling = previous_clipping_and_scrolling;
+        ret
+    }
 }
 
 /// The logical width of an insertion point: at the moment, a one-pixel-wide line.
@@ -858,25 +865,24 @@ impl FragmentDisplayListBuilding for Fragment {
             },
         }
 
-        let previous_clipping_and_scrolling = state.current_clipping_and_scrolling;
-        if !border_radii.is_zero() {
-            let clip_id = state.add_late_clip_node(bounds.to_layout(), border_radii);
-            state.current_clipping_and_scrolling = ClippingAndScrolling::simple(clip_id);
-        }
+        state.clipping_and_scrolling_scope(|state| {
+            if !border_radii.is_zero() {
+                let clip_id = state.add_late_clip_node(bounds.to_layout(), border_radii);
+                state.current_clipping_and_scrolling = ClippingAndScrolling::simple(clip_id);
+            }
 
-        let base = state.create_base_display_item(
-            &bounds,
-            &bounds,
-            self.node,
-            style.get_cursor(CursorKind::Default),
-            display_list_section,
-        );
-        state.add_display_item(DisplayItem::SolidColor(Box::new(SolidColorDisplayItem {
-            base: base,
-            color: background_color.to_layout(),
-        })));
-
-        state.current_clipping_and_scrolling = previous_clipping_and_scrolling;
+            let base = state.create_base_display_item(
+                &bounds,
+                &bounds,
+                self.node,
+                style.get_cursor(CursorKind::Default),
+                display_list_section,
+            );
+            state.add_display_item(DisplayItem::SolidColor(Box::new(SolidColorDisplayItem {
+                base: base,
+                color: background_color.to_layout(),
+            })));
+        });
 
         // The background image is painted on top of the background color.
         // Implements background image, per spec:
@@ -984,32 +990,31 @@ impl FragmentDisplayListBuilding for Fragment {
             index,
         );
 
-        let previous_clipping_and_scrolling = state.current_clipping_and_scrolling;
-        if !placement.clip_radii.is_zero() {
-            let clip_id =
-                state.add_late_clip_node(placement.clip_rect.to_layout(), placement.clip_radii);
-            state.current_clipping_and_scrolling = ClippingAndScrolling::simple(clip_id);
-        }
+        state.clipping_and_scrolling_scope(|state| {
+            if !placement.clip_radii.is_zero() {
+                let clip_id =
+                    state.add_late_clip_node(placement.clip_rect.to_layout(), placement.clip_radii);
+                state.current_clipping_and_scrolling = ClippingAndScrolling::simple(clip_id);
+            }
 
-        // Create the image display item.
-        let base = state.create_base_display_item(
-            &placement.bounds,
-            &placement.clip_rect,
-            self.node,
-            style.get_cursor(CursorKind::Default),
-            display_list_section,
-        );
+            // Create the image display item.
+            let base = state.create_base_display_item(
+                &placement.bounds,
+                &placement.clip_rect,
+                self.node,
+                style.get_cursor(CursorKind::Default),
+                display_list_section,
+            );
 
-        debug!("(building display list) adding background image.");
-        state.add_display_item(DisplayItem::Image(Box::new(ImageDisplayItem {
-            base: base,
-            id: webrender_image.key.unwrap(),
-            stretch_size: placement.tile_size.to_layout(),
-            tile_spacing: placement.tile_spacing.to_layout(),
-            image_rendering: style.get_inheritedbox().image_rendering.to_layout(),
-        })));
-
-        state.current_clipping_and_scrolling = previous_clipping_and_scrolling;
+            debug!("(building display list) adding background image.");
+            state.add_display_item(DisplayItem::Image(Box::new(ImageDisplayItem {
+                base: base,
+                id: webrender_image.key.unwrap(),
+                stretch_size: placement.tile_size.to_layout(),
+                tile_spacing: placement.tile_spacing.to_layout(),
+                image_rendering: style.get_inheritedbox().image_rendering.to_layout(),
+            })));
+        });
     }
 
     fn get_webrender_image_for_paint_worklet(
@@ -1092,54 +1097,54 @@ impl FragmentDisplayListBuilding for Fragment {
             index,
         );
 
-        let previous_clipping_and_scrolling = state.current_clipping_and_scrolling;
-        if !placement.clip_radii.is_zero() {
-            let clip_id =
-                state.add_late_clip_node(placement.clip_rect.to_layout(), placement.clip_radii);
-            state.current_clipping_and_scrolling = ClippingAndScrolling::simple(clip_id);
-        }
+        state.clipping_and_scrolling_scope(|state| {
+            if !placement.clip_radii.is_zero() {
+                let clip_id =
+                    state.add_late_clip_node(placement.clip_rect.to_layout(), placement.clip_radii);
+                state.current_clipping_and_scrolling = ClippingAndScrolling::simple(clip_id);
+            }
 
-        let base = state.create_base_display_item(
-            &placement.bounds,
-            &placement.clip_rect,
-            self.node,
-            style.get_cursor(CursorKind::Default),
-            display_list_section,
-        );
+            let base = state.create_base_display_item(
+                &placement.bounds,
+                &placement.clip_rect,
+                self.node,
+                style.get_cursor(CursorKind::Default),
+                display_list_section,
+            );
 
-        let display_item = match gradient.kind {
-            GradientKind::Linear(angle_or_corner) => {
-                let gradient = convert_linear_gradient(
-                    placement.tile_size,
-                    &gradient.items[..],
-                    angle_or_corner,
-                    gradient.repeating,
-                );
-                DisplayItem::Gradient(Box::new(GradientDisplayItem {
-                    base: base,
-                    gradient: gradient,
-                    tile: placement.tile_size.to_layout(),
-                    tile_spacing: placement.tile_spacing.to_layout(),
-                }))
-            },
-            GradientKind::Radial(shape, center, _angle) => {
-                let gradient = convert_radial_gradient(
-                    placement.tile_size,
-                    &gradient.items[..],
-                    shape,
-                    center,
-                    gradient.repeating,
-                );
-                DisplayItem::RadialGradient(Box::new(RadialGradientDisplayItem {
-                    base: base,
-                    gradient: gradient,
-                    tile: placement.tile_size.to_layout(),
-                    tile_spacing: placement.tile_spacing.to_layout(),
-                }))
-            },
-        };
-        state.add_display_item(display_item);
-        state.current_clipping_and_scrolling = previous_clipping_and_scrolling;
+            let display_item = match gradient.kind {
+                GradientKind::Linear(angle_or_corner) => {
+                    let gradient = convert_linear_gradient(
+                        placement.tile_size,
+                        &gradient.items[..],
+                        angle_or_corner,
+                        gradient.repeating,
+                    );
+                    DisplayItem::Gradient(Box::new(GradientDisplayItem {
+                        base: base,
+                        gradient: gradient,
+                        tile: placement.tile_size.to_layout(),
+                        tile_spacing: placement.tile_spacing.to_layout(),
+                    }))
+                },
+                GradientKind::Radial(shape, center, _angle) => {
+                    let gradient = convert_radial_gradient(
+                        placement.tile_size,
+                        &gradient.items[..],
+                        shape,
+                        center,
+                        gradient.repeating,
+                    );
+                    DisplayItem::RadialGradient(Box::new(RadialGradientDisplayItem {
+                        base: base,
+                        gradient: gradient,
+                        tile: placement.tile_size.to_layout(),
+                        tile_spacing: placement.tile_spacing.to_layout(),
+                    }))
+                },
+            };
+            state.add_display_item(display_item);
+        });
     }
 
     fn build_display_list_for_box_shadow_if_applicable(
@@ -1677,7 +1682,13 @@ impl FragmentDisplayListBuilding for Fragment {
         debug!("Fragment::build_display_list: intersected. Adding display item...");
 
         // Create special per-fragment-type display items.
-        self.build_fragment_type_specific_display_items(state, &stacking_relative_border_box, clip);
+        state.clipping_and_scrolling_scope(|state| {
+            self.build_fragment_type_specific_display_items(
+                state,
+                &stacking_relative_border_box,
+                clip,
+            );
+        });
 
         if opts::get().show_debug_fragment_borders {
             self.build_debug_borders_around_fragment(state, &stacking_relative_border_box, clip)
@@ -1690,8 +1701,6 @@ impl FragmentDisplayListBuilding for Fragment {
         stacking_relative_border_box: &Rect<Au>,
         clip: &Rect<Au>,
     ) {
-        let previous_clipping_and_scrolling = state.current_clipping_and_scrolling;
-
         // Compute the context box position relative to the parent stacking context.
         let stacking_relative_content_box =
             self.stacking_relative_content_box(stacking_relative_border_box);
@@ -1860,8 +1869,6 @@ impl FragmentDisplayListBuilding for Fragment {
                 panic!("Shouldn't see table column fragments here.")
             },
         }
-
-        state.current_clipping_and_scrolling = previous_clipping_and_scrolling;
     }
 
     fn create_stacking_context(
diff --git a/components/layout/display_list/items.rs b/components/layout/display_list/items.rs
index 4e259d90154..3ea11c565d7 100644
--- a/components/layout/display_list/items.rs
+++ b/components/layout/display_list/items.rs
@@ -71,10 +71,7 @@ impl ClippingAndScrolling {
         }
     }
 
-    pub fn new(
-        scrolling: ClipScrollNodeIndex,
-        clipping: ClipScrollNodeIndex,
-    ) -> ClippingAndScrolling {
+    pub fn new(scrolling: ClipScrollNodeIndex, clipping: ClipScrollNodeIndex) -> Self {
         ClippingAndScrolling {
             scrolling,
             clipping: Some(clipping),
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index e8d42f99e4d..116ecaeee47 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -483718,7 +483718,7 @@
    "support"
   ],
   "css/css-backgrounds/background-rounded-image-clip.html": [
-   "c22edf865829fea1d69a54e34396b4462250585f",
+   "1f3a33ee141f0bf0186875d376bc95414db8dd18",
    "reftest"
   ],
   "css/css-backgrounds/background-size-001.html": [
@@ -485926,7 +485926,7 @@
    "support"
   ],
   "css/css-backgrounds/reference/background-rounded-image-clip.html": [
-   "f5c1af4d9e5b415e762c921c6d93355b2861946c",
+   "0f98f9c82627977b11cde5f7c8ba536104cccdd2",
    "support"
   ],
   "css/css-backgrounds/reference/background-size-002-ref.html": [
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-rounded-image-clip.html b/tests/wpt/web-platform-tests/css/css-backgrounds/background-rounded-image-clip.html
index 244ee2b9181..1179ba54996 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/background-rounded-image-clip.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/background-rounded-image-clip.html
@@ -28,7 +28,5 @@
         border-color: transparent;
     }
 </style>
-<body>
-    <div id="a"></div>
-    <div id="b"></div>
-</body>
+<div id="a"></div>
+<div id="b"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-rounded-image-clip.html b/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-rounded-image-clip.html
index 2ec7021d188..2436bedad50 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-rounded-image-clip.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-rounded-image-clip.html
@@ -1,4 +1,6 @@
 <!doctype html>
+<meta charset="utf-8">
+<title>Corner Clipped Background Color</title>
 <style>
     html {
         background-color: green;