diff --git a/layout/base/nsCSSRendering.h b/layout/base/nsCSSRendering.h
index ced171f90fa9..a12f889f35e7 100644
--- a/layout/base/nsCSSRendering.h
+++ b/layout/base/nsCSSRendering.h
@@ -142,7 +142,7 @@ public:
                               const nsStylePadding& aPadding,
                               nscoord aDX,
                               nscoord aDY,
-                              PRBool aUsePrintSettings=PR_FALSE);
+                              PRBool aUsePrintSettings);
 
   /**
    * Same as |PaintBackground|, except using the provided style context
diff --git a/layout/forms/nsButtonFrameRenderer.cpp b/layout/forms/nsButtonFrameRenderer.cpp
index 65a3299a88c2..ac98d993321d 100644
--- a/layout/forms/nsButtonFrameRenderer.cpp
+++ b/layout/forms/nsButtonFrameRenderer.cpp
@@ -184,7 +184,7 @@ nsButtonFrameRenderer::PaintBorderAndBackground(nsIPresContext* aPresContext,
 
   nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, mFrame,
                                   aDirtyRect, buttonRect, *border, *padding,
-                                  0, 0);
+                                  0, 0, PR_FALSE);
   nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, mFrame,
                               aDirtyRect, buttonRect, *border, context, 0);
 }
diff --git a/layout/forms/nsFieldSetFrame.cpp b/layout/forms/nsFieldSetFrame.cpp
index 260e2c7c6349..4ae7e35ea0ee 100644
--- a/layout/forms/nsFieldSetFrame.cpp
+++ b/layout/forms/nsFieldSetFrame.cpp
@@ -218,7 +218,7 @@ nsFieldSetFrame::Paint(nsIPresContext*      aPresContext,
 
         nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this,
                                         aDirtyRect, rect, *borderStyle,
-                                        *paddingStyle, 0, 0);
+                                        *paddingStyle, 0, 0, PR_TRUE);
 
         if (mLegendFrame) {
 
diff --git a/layout/forms/nsGfxCheckboxControlFrame.cpp b/layout/forms/nsGfxCheckboxControlFrame.cpp
index 6522e4c6dceb..20d49fe67a8e 100644
--- a/layout/forms/nsGfxCheckboxControlFrame.cpp
+++ b/layout/forms/nsGfxCheckboxControlFrame.cpp
@@ -259,7 +259,7 @@ nsGfxCheckboxControlFrame::Paint(nsIPresContext*   aPresContext,
 
         nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this,
                                         aDirtyRect, rect, *myBorder, *myPadding,
-                                        0, 0);
+                                        0, 0, PR_FALSE);
         nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this,
                                     aDirtyRect, rect, *myBorder, mCheckButtonFaceStyle, 0);
         doDefaultPainting = PR_FALSE;
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index fa5d2dfff988..65cc21badaf6 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -974,7 +974,7 @@ nsFrame::PaintSelf(nsIPresContext*      aPresContext,
   nsRect rect(0, 0, mRect.width, mRect.height);
   nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this,
                                   aDirtyRect, rect, *border, *padding,
-                                  0, 0);
+                                  0, 0, PR_TRUE);
   nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this,
                               aDirtyRect, rect, *border, mStyleContext,
                               aSkipSides);
diff --git a/layout/html/base/src/nsFrame.cpp b/layout/html/base/src/nsFrame.cpp
index fa5d2dfff988..65cc21badaf6 100644
--- a/layout/html/base/src/nsFrame.cpp
+++ b/layout/html/base/src/nsFrame.cpp
@@ -974,7 +974,7 @@ nsFrame::PaintSelf(nsIPresContext*      aPresContext,
   nsRect rect(0, 0, mRect.width, mRect.height);
   nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this,
                                   aDirtyRect, rect, *border, *padding,
-                                  0, 0);
+                                  0, 0, PR_TRUE);
   nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this,
                               aDirtyRect, rect, *border, mStyleContext,
                               aSkipSides);
diff --git a/layout/html/base/src/nsHRFrame.cpp b/layout/html/base/src/nsHRFrame.cpp
index f7387efbeab0..e81abb6f08b2 100644
--- a/layout/html/base/src/nsHRFrame.cpp
+++ b/layout/html/base/src/nsHRFrame.cpp
@@ -198,7 +198,7 @@ HRuleFrame::Paint(nsIPresContext*      aPresContext,
     
     nsCSSRendering::PaintBackground(aPresContext, aRenderingContext,
                                     this,aDirtyRect, rect,
-                                    *border, *padding, 0, 0);
+                                    *border, *padding, 0, 0, PR_FALSE);
     nsCSSRendering::PaintBorder(aPresContext, aRenderingContext,
                                 this,aDirtyRect, rect, *border,
                                 mStyleContext, 0);
diff --git a/layout/html/forms/src/nsButtonFrameRenderer.cpp b/layout/html/forms/src/nsButtonFrameRenderer.cpp
index 65a3299a88c2..ac98d993321d 100644
--- a/layout/html/forms/src/nsButtonFrameRenderer.cpp
+++ b/layout/html/forms/src/nsButtonFrameRenderer.cpp
@@ -184,7 +184,7 @@ nsButtonFrameRenderer::PaintBorderAndBackground(nsIPresContext* aPresContext,
 
   nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, mFrame,
                                   aDirtyRect, buttonRect, *border, *padding,
-                                  0, 0);
+                                  0, 0, PR_FALSE);
   nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, mFrame,
                               aDirtyRect, buttonRect, *border, context, 0);
 }
diff --git a/layout/html/forms/src/nsFieldSetFrame.cpp b/layout/html/forms/src/nsFieldSetFrame.cpp
index 260e2c7c6349..4ae7e35ea0ee 100644
--- a/layout/html/forms/src/nsFieldSetFrame.cpp
+++ b/layout/html/forms/src/nsFieldSetFrame.cpp
@@ -218,7 +218,7 @@ nsFieldSetFrame::Paint(nsIPresContext*      aPresContext,
 
         nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this,
                                         aDirtyRect, rect, *borderStyle,
-                                        *paddingStyle, 0, 0);
+                                        *paddingStyle, 0, 0, PR_TRUE);
 
         if (mLegendFrame) {
 
diff --git a/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp b/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp
index 6522e4c6dceb..20d49fe67a8e 100644
--- a/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp
+++ b/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp
@@ -259,7 +259,7 @@ nsGfxCheckboxControlFrame::Paint(nsIPresContext*   aPresContext,
 
         nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this,
                                         aDirtyRect, rect, *myBorder, *myPadding,
-                                        0, 0);
+                                        0, 0, PR_FALSE);
         nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this,
                                     aDirtyRect, rect, *myBorder, mCheckButtonFaceStyle, 0);
         doDefaultPainting = PR_FALSE;
diff --git a/layout/html/style/src/nsCSSRendering.h b/layout/html/style/src/nsCSSRendering.h
index ced171f90fa9..a12f889f35e7 100644
--- a/layout/html/style/src/nsCSSRendering.h
+++ b/layout/html/style/src/nsCSSRendering.h
@@ -142,7 +142,7 @@ public:
                               const nsStylePadding& aPadding,
                               nscoord aDX,
                               nscoord aDY,
-                              PRBool aUsePrintSettings=PR_FALSE);
+                              PRBool aUsePrintSettings);
 
   /**
    * Same as |PaintBackground|, except using the provided style context
diff --git a/layout/xul/base/src/nsGroupBoxFrame.cpp b/layout/xul/base/src/nsGroupBoxFrame.cpp
index 226c00871dbc..bf1cb48d8338 100644
--- a/layout/xul/base/src/nsGroupBoxFrame.cpp
+++ b/layout/xul/base/src/nsGroupBoxFrame.cpp
@@ -164,7 +164,7 @@ nsGroupBoxFrame::Paint(nsIPresContext*      aPresContext,
 
         nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this,
                                         aDirtyRect, rect, *borderStyleData,
-                                        *paddingStyleData, 0, 0);
+                                        *paddingStyleData, 0, 0, PR_FALSE);
 
         if (groupBox) {