--- a/layout/svg/nsFilterInstance.cpp
+++ b/layout/svg/nsFilterInstance.cpp
@@ -5,16 +5,17 @@
 
 // Main header first:
 #include "nsFilterInstance.h"
 
 // MFBT headers next:
 #include "mozilla/UniquePtr.h"
 
 // Keep others in (case-insensitive) order:
+#include "gfx2DGlue.h"
 #include "gfxPlatform.h"
 #include "gfxUtils.h"
 #include "mozilla/gfx/Helpers.h"
 #include "nsISVGChildFrame.h"
 #include "nsRenderingContext.h"
 #include "nsCSSFilterInstance.h"
 #include "nsSVGFilterInstance.h"
 #include "nsSVGFilterPaintCallback.h"
@@ -362,36 +363,29 @@ nsFilterInstance::BuildSourcePaint(Sourc
   }
 
   if (!mPaintTransform.IsSingular()) {
     nsRefPtr<gfxContext> gfx = new gfxContext(offscreenDT);
     gfx->Save();
     gfx->Multiply(mPaintTransform *
                   deviceToFilterSpace *
                   gfxMatrix::Translation(-neededRect.TopLeft()));
-    gfx->Rectangle(FilterSpaceToUserSpace(neededRect));
+    nsRefPtr<gfxPattern> pattern;
     if (aSource == &mFillPaint) {
-      nsRefPtr<gfxPattern> fillPattern =
-        nsSVGUtils::MakeFillPatternFor(mTargetFrame, gfx);
-      if (fillPattern) {
-        gfx->SetPattern(fillPattern);
-        gfx->Fill();
-      }
+      pattern = nsSVGUtils::MakeFillPatternFor(mTargetFrame, gfx);
     } else if (aSource == &mStrokePaint) {
-      nsRefPtr<gfxPattern> strokePattern =
-        nsSVGUtils::MakeStrokePatternFor(mTargetFrame, gfx);
-      if (strokePattern) {
-        gfx->SetPattern(strokePattern);
-        gfx->Fill(); // yes, filling a primitive subregion with _stroke_ paint
-      }
+      pattern = nsSVGUtils::MakeStrokePatternFor(mTargetFrame, gfx);
+    }
+    if (pattern) {
+      offscreenDT->FillRect(ToRect(FilterSpaceToUserSpace(neededRect)),
+                            *pattern->GetPattern(offscreenDT));
     }
     gfx->Restore();
   }
 
-
   aSource->mSourceSurface = offscreenDT->Snapshot();
   aSource->mSurfaceRect = ToIntRect(neededRect);
 
   return NS_OK;
 }
 
 nsresult
 nsFilterInstance::BuildSourcePaints(DrawTarget* aTargetDT)