--- a/gfx/thebes/gfxContext.cpp
+++ b/gfx/thebes/gfxContext.cpp
@@ -1764,42 +1764,53 @@ gfxContext::PointInStroke(const gfxPoint
 gfxRect
 gfxContext::GetUserPathExtent()
 {
   if (mCairo) {
     double xmin, ymin, xmax, ymax;
     cairo_path_extents(mCairo, &xmin, &ymin, &xmax, &ymax);
     return gfxRect(xmin, ymin, xmax - xmin, ymax - ymin);
   } else {
+    if (mPathIsRect) {
+      return ThebesRect(mTransform.TransformBounds(mRect));
+    }
     EnsurePath();
     return ThebesRect(mPath->GetBounds());
   }
 }
 
 gfxRect
 gfxContext::GetUserFillExtent()
 {
   if (mCairo) {
     double xmin, ymin, xmax, ymax;
     cairo_fill_extents(mCairo, &xmin, &ymin, &xmax, &ymax);
     return gfxRect(xmin, ymin, xmax - xmin, ymax - ymin);
   } else {
+    if (mPathIsRect) {
+      return ThebesRect(mTransform.TransformBounds(mRect));
+    }
     EnsurePath();
     return ThebesRect(mPath->GetBounds());
   }
 }
 
 gfxRect
 gfxContext::GetUserStrokeExtent()
 {
   if (mCairo) {
     double xmin, ymin, xmax, ymax;
     cairo_stroke_extents(mCairo, &xmin, &ymin, &xmax, &ymax);
     return gfxRect(xmin, ymin, xmax - xmin, ymax - ymin);
   } else {
+    if (mPathIsRect) {
+      Rect rect = mRect;
+      rect.Inflate(CurrentState().strokeOptions.mLineWidth / 2);
+      return ThebesRect(mTransform.TransformBounds(rect));
+    }
     EnsurePath();
     return ThebesRect(mPath->GetStrokedBounds(CurrentState().strokeOptions, mTransform));
   }
 }
 
 bool
 gfxContext::HasError()
 {