--- a/gfx/layers/wr/ScrollingLayersHelper.cpp
+++ b/gfx/layers/wr/ScrollingLayersHelper.cpp
@@ -54,29 +54,18 @@ ScrollingLayersHelper::ScrollingLayersHe
         aStackingContext.ToRelativeWrRect(contentRect),
         aStackingContext.ToRelativeWrRect(clipBounds));
   }
 
   // The scrolled clip on the layer is "inside" all of the scrollable metadatas
   // on that layer. That is, the clip scrolls along with the content in
   // child layers. So we need to apply this after pushing all the scroll layers,
   // which we do above.
-  if (Maybe<LayerClip> scrolledClip = layer->GetScrolledClip()) {
-    LayerRect clipRect = IntRectToRect(ViewAs<LayerPixel>(
-        scrolledClip->GetClipRect(),
-        PixelCastJustification::MovingDownToChildren));
-    Maybe<WrImageMask> mask;
-    if (Maybe<size_t> maskLayerIndex = scrolledClip->GetMaskLayerIndex()) {
-      Layer* maskLayer = layer->GetAncestorMaskLayerAt(maskLayerIndex.value());
-      WebRenderLayer* maskWrLayer = WebRenderLayer::ToWebRenderLayer(maskLayer);
-      // TODO: check this transform is correct in all cases
-      mask = maskWrLayer->RenderMaskLayer(aStackingContext, maskLayer->GetTransform());
-    }
-    mBuilder->PushClip(aStackingContext.ToRelativeWrRect(clipRect),
-        mask.ptrOr(nullptr));
+  if (const Maybe<LayerClip>& scrolledClip = layer->GetScrolledClip()) {
+    PushLayerClip(scrolledClip.ref(), aStackingContext);
   }
 
   // If the layer is marked as fixed-position, it is fixed relative to something
   // (the scroll layer referred to by GetFixedPositionScrollContainerId, hereafter
   // referred to as the "scroll container"). What this really means is that we
   // don't want this content to scroll with any scroll layer on the stack up to
   // and including the scroll container, but we do want it to scroll with any
   // ancestor scroll layers. So we do a PushClipAndScrollInfo that maintains
@@ -109,16 +98,32 @@ ScrollingLayersHelper::PushLayerLocalCli
     Maybe<WrImageMask> mask = mLayer->BuildWrMaskLayer(aStackingContext);
     LayerRect clipRect = ViewAs<LayerPixel>(clip.ref(),
         PixelCastJustification::MovingDownToChildren);
     mBuilder->PushClip(aStackingContext.ToRelativeWrRect(clipRect), mask.ptrOr(nullptr));
     mPushedLayerLocalClip = true;
   }
 }
 
+void
+ScrollingLayersHelper::PushLayerClip(const LayerClip& aClip,
+                                     const StackingContextHelper& aSc)
+{
+  LayerRect clipRect = IntRectToRect(ViewAs<LayerPixel>(aClip.GetClipRect(),
+        PixelCastJustification::MovingDownToChildren));
+  Maybe<WrImageMask> mask;
+  if (Maybe<size_t> maskLayerIndex = aClip.GetMaskLayerIndex()) {
+    Layer* maskLayer = mLayer->GetLayer()->GetAncestorMaskLayerAt(maskLayerIndex.value());
+    WebRenderLayer* maskWrLayer = WebRenderLayer::ToWebRenderLayer(maskLayer);
+    // TODO: check this transform is correct in all cases
+    mask = maskWrLayer->RenderMaskLayer(aSc, maskLayer->GetTransform());
+  }
+  mBuilder->PushClip(aSc.ToRelativeWrRect(clipRect), mask.ptrOr(nullptr));
+}
+
 ScrollingLayersHelper::~ScrollingLayersHelper()
 {
   Layer* layer = mLayer->GetLayer();
   if (mPushedLayerLocalClip) {
     mBuilder->PopClip();
   }
   if (!mLayer->WrManager()->AsyncPanZoomEnabled()) {
     return;

--- a/gfx/layers/wr/ScrollingLayersHelper.h
+++ b/gfx/layers/wr/ScrollingLayersHelper.h
@@ -11,29 +11,32 @@
 namespace mozilla {
 
 namespace wr {
 class DisplayListBuilder;
 }
 
 namespace layers {
 
+struct LayerClip;
 class StackingContextHelper;
 class WebRenderLayer;
 
 class MOZ_RAII ScrollingLayersHelper
 {
 public:
   ScrollingLayersHelper(WebRenderLayer* aLayer,
                         wr::DisplayListBuilder& aBuilder,
                         const StackingContextHelper& aSc);
   ~ScrollingLayersHelper();
 
 private:
   void PushLayerLocalClip(const StackingContextHelper& aStackingContext);
+  void PushLayerClip(const LayerClip& aClip,
+                     const StackingContextHelper& aSc);
 
   WebRenderLayer* mLayer;
   wr::DisplayListBuilder* mBuilder;
   bool mPushedLayerLocalClip;
 };
 
 } // namespace layers
 } // namespace mozilla