diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp
index 0c8b60c126a..56e3125fb80 100644
--- a/mozilla/layout/base/nsPresShell.cpp
+++ b/mozilla/layout/base/nsPresShell.cpp
@@ -1929,11 +1929,11 @@ PresShell::Paint(nsIView              *aView,
 
   if (nsnull != frame) {
     rv = frame->Paint(*mPresContext, aRenderingContext, aDirtyRect,
-                      eFramePaintLayer_Underlay);
+                      NS_FRAME_PAINT_LAYER_BACKGROUND);
     rv = frame->Paint(*mPresContext, aRenderingContext, aDirtyRect,
-                      eFramePaintLayer_Content);
+                      NS_FRAME_PAINT_LAYER_FLOATERS);
     rv = frame->Paint(*mPresContext, aRenderingContext, aDirtyRect,
-                      eFramePaintLayer_Overlay);
+                      NS_FRAME_PAINT_LAYER_FOREGROUND);
 #ifdef NS_DEBUG
     // Draw a border around the frame
     if (nsIFrame::GetShowFrameBorders()) {
diff --git a/mozilla/layout/forms/nsButtonFrameRenderer.cpp b/mozilla/layout/forms/nsButtonFrameRenderer.cpp
index 7e34bb5de16..446c8b87f75 100644
--- a/mozilla/layout/forms/nsButtonFrameRenderer.cpp
+++ b/mozilla/layout/forms/nsButtonFrameRenderer.cpp
@@ -334,7 +334,7 @@ nsButtonFrameRenderer::PaintOutlineAndFocusBorders(nsIPresContext& aPresContext,
 
 	nsRect rect;
 
-    if (eFramePaintLayer_Underlay == aWhichLayer) 
+    if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) 
 	{
 
 		if (mOuterFocusStyle) {
@@ -360,7 +360,7 @@ nsButtonFrameRenderer::PaintOutlineAndFocusBorders(nsIPresContext& aPresContext,
 		}
 	}
 
-    if (eFramePaintLayer_Overlay == aWhichLayer) 
+    if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) 
 	{
 		if /*(mOutlineStyle) */ (PR_FALSE) {
 
@@ -391,7 +391,7 @@ nsButtonFrameRenderer::PaintBorderAndBackground(nsIPresContext& aPresContext,
 
 {
 
-    if (eFramePaintLayer_Underlay != aWhichLayer) 
+    if (NS_FRAME_PAINT_LAYER_BACKGROUND != aWhichLayer) 
 	   return;
 
 	// get the button rect this is inside the focus and outline rects
diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp
index abd0c74fb62..31ca31fa35b 100644
--- a/mozilla/layout/forms/nsComboboxControlFrame.cpp
+++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp
@@ -571,7 +571,7 @@ nsComboboxControlFrame::Paint(nsIPresContext& aPresContext,
                           const nsRect& aDirtyRect,
                           nsFramePaintLayer aWhichLayer)
 {
-  if (eFramePaintLayer_Content == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) {
     PaintComboboxControl(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer);
   }
   return NS_OK;
diff --git a/mozilla/layout/forms/nsFieldSetFrame.cpp b/mozilla/layout/forms/nsFieldSetFrame.cpp
index f20243cea7b..462e3a00247 100644
--- a/mozilla/layout/forms/nsFieldSetFrame.cpp
+++ b/mozilla/layout/forms/nsFieldSetFrame.cpp
@@ -178,7 +178,7 @@ nsFieldSetFrame::Paint(nsIPresContext& aPresContext,
                        const nsRect& aDirtyRect,
                        nsFramePaintLayer aWhichLayer)
 {
-  if (eFramePaintLayer_Underlay == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) {
     // Paint our background and border
     const nsStyleDisplay* disp =
       (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display);
@@ -213,7 +213,7 @@ nsFieldSetFrame::Paint(nsIPresContext& aPresContext,
 
   PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer);
 
-  if ((eFramePaintLayer_Overlay == aWhichLayer) && GetShowFrameBorders()) {
+  if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) {
     nsIView* view;
     GetView(&view);
     if (nsnull != view) {
diff --git a/mozilla/layout/forms/nsFileControlFrame.cpp b/mozilla/layout/forms/nsFileControlFrame.cpp
index b0629e30ab2..9f28dedc6dd 100644
--- a/mozilla/layout/forms/nsFileControlFrame.cpp
+++ b/mozilla/layout/forms/nsFileControlFrame.cpp
@@ -463,7 +463,7 @@ nsFileControlFrame::Paint(nsIPresContext& aPresContext,
 
   mTextFrame->PaintTextControlBackground(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer);
 
-  if (eFramePaintLayer_Content == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) {
     nsString text;
     if (NS_SUCCEEDED(nsFormControlHelper::GetInputElementValue(mContent, &text, PR_FALSE))) {
       nsRect rect;
diff --git a/mozilla/layout/forms/nsTextControlFrame.cpp b/mozilla/layout/forms/nsTextControlFrame.cpp
index 93cac882f1d..1c3b90045d6 100644
--- a/mozilla/layout/forms/nsTextControlFrame.cpp
+++ b/mozilla/layout/forms/nsTextControlFrame.cpp
@@ -804,7 +804,7 @@ nsTextControlFrame::Paint(nsIPresContext& aPresContext,
                           nsFramePaintLayer aWhichLayer)
 {
   PaintTextControlBackground(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer);
-  if (eFramePaintLayer_Content == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) {
     nsString text;
     GetText(&text, PR_FALSE);
     nsRect rect(0, 0, mRect.width, mRect.height);
diff --git a/mozilla/layout/generic/nsAreaFrame.cpp b/mozilla/layout/generic/nsAreaFrame.cpp
index 7e763babddc..aa016a42112 100644
--- a/mozilla/layout/generic/nsAreaFrame.cpp
+++ b/mozilla/layout/generic/nsAreaFrame.cpp
@@ -222,7 +222,7 @@ nsAreaFrame::Paint(nsIPresContext&      aPresContext,
   nsresult rv = nsBlockFrame::Paint(aPresContext, aRenderingContext,
                                     aDirtyRect, aWhichLayer);
 
-  if ((eFramePaintLayer_Overlay == aWhichLayer) && nsIFrame::GetShowFrameBorders()) {
+  if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) {
     // Render the bands in the spacemanager
     nsISpaceManager* sm = mSpaceManager;
 
diff --git a/mozilla/layout/generic/nsBulletFrame.cpp b/mozilla/layout/generic/nsBulletFrame.cpp
index 23e1ae86183..d05d364539b 100644
--- a/mozilla/layout/generic/nsBulletFrame.cpp
+++ b/mozilla/layout/generic/nsBulletFrame.cpp
@@ -61,7 +61,7 @@ nsBulletFrame::Paint(nsIPresContext&      aCX,
                      const nsRect&        aDirtyRect,
                      nsFramePaintLayer    aWhichLayer)
 {
-  if (eFramePaintLayer_Content != aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) {
     return NS_OK;
   }
 
diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp
index 96e5b0e5de0..40146196254 100644
--- a/mozilla/layout/generic/nsFrame.cpp
+++ b/mozilla/layout/generic/nsFrame.cpp
@@ -652,7 +652,7 @@ nsFrame::Paint(nsIPresContext&      aPresContext,
                const nsRect&        aDirtyRect,
                nsFramePaintLayer    aWhichLayer)
 {
-  if (eFramePaintLayer_Overlay == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) {
     if (DisplaySelection(aPresContext) == PR_FALSE)
       return NS_OK;
 
diff --git a/mozilla/layout/generic/nsFrameSetFrame.cpp b/mozilla/layout/generic/nsFrameSetFrame.cpp
index df5f7560b5c..a01167da568 100644
--- a/mozilla/layout/generic/nsFrameSetFrame.cpp
+++ b/mozilla/layout/generic/nsFrameSetFrame.cpp
@@ -1568,7 +1568,7 @@ nsHTMLFramesetBorderFrame::Paint(nsIPresContext&      aPresContext,
                                  const nsRect&        aDirtyRect,
                                  nsFramePaintLayer    aWhichLayer)
 {
-  if (eFramePaintLayer_Content != aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) {
     return NS_OK;
   }
   //printf("border frame paint %X (%d,%d,%d,%d) \n", this, aDirtyRect.x, aDirtyRect.y, aDirtyRect.width, aDirtyRect.height);
@@ -1740,7 +1740,7 @@ nsHTMLFramesetBlankFrame::Paint(nsIPresContext&      aPresContext,
                                 const nsRect&        aDirtyRect,
                                 nsFramePaintLayer    aWhichLayer)
 {
-  if (eFramePaintLayer_Content != aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) {
     return NS_OK;
   }
   nscolor white = NS_RGB(255,255,255);
diff --git a/mozilla/layout/generic/nsHTMLContainerFrame.cpp b/mozilla/layout/generic/nsHTMLContainerFrame.cpp
index b8ddf687815..b6d20510c5d 100644
--- a/mozilla/layout/generic/nsHTMLContainerFrame.cpp
+++ b/mozilla/layout/generic/nsHTMLContainerFrame.cpp
@@ -53,7 +53,7 @@ nsHTMLContainerFrame::Paint(nsIPresContext& aPresContext,
                             const nsRect& aDirtyRect,
                             nsFramePaintLayer aWhichLayer)
 {
-  if (eFramePaintLayer_Underlay == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) {
     const nsStyleDisplay* disp = (const nsStyleDisplay*)
       mStyleContext->GetStyleData(eStyleStruct_Display);
     if (disp->mVisible && mRect.width && mRect.height) {
diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp
index 42525733857..70d38c79467 100644
--- a/mozilla/layout/generic/nsImageFrame.cpp
+++ b/mozilla/layout/generic/nsImageFrame.cpp
@@ -754,7 +754,7 @@ nsImageFrame::Paint(nsIPresContext& aPresContext,
     if (nsnull == image) {
       // No image yet, or image load failed. Draw the alt-text and an icon
       // indicating the status
-      if (eFramePaintLayer_Underlay == aWhichLayer) {
+      if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) {
         DisplayAltFeedback(aPresContext, aRenderingContext,
                            mImageLoader.GetLoadImageFailed()
                            ? NS_ICON_BROKEN_IMAGE
@@ -763,7 +763,7 @@ nsImageFrame::Paint(nsIPresContext& aPresContext,
       return NS_OK;
     }
 
-    if ((eFramePaintLayer_Content == aWhichLayer)
+    if ((NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer)
 #ifdef LET_IMAGE_LIBRARY_SCALE_ASPECT_IMAGES
         && mImageLoader.HaveImageSize()
 #endif
@@ -781,7 +781,7 @@ nsImageFrame::Paint(nsIPresContext& aPresContext,
       aRenderingContext.DrawImage(image, inner);
     }
 
-    if ((eFramePaintLayer_Overlay == aWhichLayer) && GetShowFrameBorders()) {
+    if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) {
       nsImageMap* map = GetImageMap();
       if (nsnull != map) {
         nsRect inner;
diff --git a/mozilla/layout/generic/nsLeafFrame.cpp b/mozilla/layout/generic/nsLeafFrame.cpp
index f3cc92676ad..2840e19832c 100644
--- a/mozilla/layout/generic/nsLeafFrame.cpp
+++ b/mozilla/layout/generic/nsLeafFrame.cpp
@@ -35,7 +35,7 @@ nsLeafFrame::Paint(nsIPresContext& aPresContext,
                    const nsRect& aDirtyRect,
                    nsFramePaintLayer aWhichLayer)
 {
-  if (eFramePaintLayer_Underlay == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) {
     const nsStyleDisplay* disp = (const nsStyleDisplay*)
       mStyleContext->GetStyleData(eStyleStruct_Display);
     if (disp->mVisible) {
diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp
index 41f8dd18fe5..2716c2c5a68 100644
--- a/mozilla/layout/generic/nsObjectFrame.cpp
+++ b/mozilla/layout/generic/nsObjectFrame.cpp
@@ -1337,7 +1337,7 @@ nsObjectFrame::Paint(nsIPresContext& aPresContext,
     return NS_OK;
   }
 
-  if (eFramePaintLayer_Content == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) {
     const nsStyleFont* font = (const nsStyleFont*)
       mStyleContext->GetStyleData(eStyleStruct_Font);
 
@@ -1360,7 +1360,7 @@ nsObjectFrame::Paint(nsIPresContext& aPresContext,
   }
 #else
   // delegate all painting to the plugin instance.
-  if (eFramePaintLayer_Content == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) {
     mInstanceOwner->Paint(aDirtyRect);
   }
 #endif /* !XP_MAC */
diff --git a/mozilla/layout/generic/nsPlaceholderFrame.cpp b/mozilla/layout/generic/nsPlaceholderFrame.cpp
index 5e8cbf25910..5288d2ca216 100644
--- a/mozilla/layout/generic/nsPlaceholderFrame.cpp
+++ b/mozilla/layout/generic/nsPlaceholderFrame.cpp
@@ -73,7 +73,7 @@ nsPlaceholderFrame::Paint(nsIPresContext& aPresContext,
                           const nsRect& aDirtyRect,
                           nsFramePaintLayer aWhichLayer)
 {
-  if ((eFramePaintLayer_Overlay == aWhichLayer) && GetShowFrameBorders()) {
+  if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) {
     float p2t;
     aPresContext.GetPixelsToTwips(&p2t);
     aRenderingContext.SetColor(NS_RGB(0, 255, 255));
diff --git a/mozilla/layout/generic/nsSimplePageSequence.cpp b/mozilla/layout/generic/nsSimplePageSequence.cpp
index 4e6a1939c44..ffeee65d43e 100644
--- a/mozilla/layout/generic/nsSimplePageSequence.cpp
+++ b/mozilla/layout/generic/nsSimplePageSequence.cpp
@@ -277,7 +277,7 @@ nsSimplePageSequenceFrame::Paint(nsIPresContext&      aPresContext,
                                  const nsRect&        aDirtyRect,
                                  nsFramePaintLayer    aWhichLayer)
 {
-  if (eFramePaintLayer_Underlay == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) {
     // Paint a white background
     aRenderingContext.SetColor(NS_RGB(255,255,255));
     aRenderingContext.FillRect(aDirtyRect);
@@ -299,7 +299,7 @@ nsSimplePageSequenceFrame::PaintChild(nsIPresContext&      aPresContext,
   nsContainerFrame::PaintChild(aPresContext, aRenderingContext,
                                aDirtyRect, aFrame, aWhichLayer);
 
-  if (eFramePaintLayer_Overlay == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) {
     // XXX Paint a one-pixel border around the page so it's easy to see where
     // each page begins and ends when we're in print preview mode
     nsRect  pageBounds;
diff --git a/mozilla/layout/html/base/src/nsAreaFrame.cpp b/mozilla/layout/html/base/src/nsAreaFrame.cpp
index 7e763babddc..aa016a42112 100644
--- a/mozilla/layout/html/base/src/nsAreaFrame.cpp
+++ b/mozilla/layout/html/base/src/nsAreaFrame.cpp
@@ -222,7 +222,7 @@ nsAreaFrame::Paint(nsIPresContext&      aPresContext,
   nsresult rv = nsBlockFrame::Paint(aPresContext, aRenderingContext,
                                     aDirtyRect, aWhichLayer);
 
-  if ((eFramePaintLayer_Overlay == aWhichLayer) && nsIFrame::GetShowFrameBorders()) {
+  if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) {
     // Render the bands in the spacemanager
     nsISpaceManager* sm = mSpaceManager;
 
diff --git a/mozilla/layout/html/base/src/nsBulletFrame.cpp b/mozilla/layout/html/base/src/nsBulletFrame.cpp
index 23e1ae86183..d05d364539b 100644
--- a/mozilla/layout/html/base/src/nsBulletFrame.cpp
+++ b/mozilla/layout/html/base/src/nsBulletFrame.cpp
@@ -61,7 +61,7 @@ nsBulletFrame::Paint(nsIPresContext&      aCX,
                      const nsRect&        aDirtyRect,
                      nsFramePaintLayer    aWhichLayer)
 {
-  if (eFramePaintLayer_Content != aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) {
     return NS_OK;
   }
 
diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp
index 96e5b0e5de0..40146196254 100644
--- a/mozilla/layout/html/base/src/nsFrame.cpp
+++ b/mozilla/layout/html/base/src/nsFrame.cpp
@@ -652,7 +652,7 @@ nsFrame::Paint(nsIPresContext&      aPresContext,
                const nsRect&        aDirtyRect,
                nsFramePaintLayer    aWhichLayer)
 {
-  if (eFramePaintLayer_Overlay == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) {
     if (DisplaySelection(aPresContext) == PR_FALSE)
       return NS_OK;
 
diff --git a/mozilla/layout/html/base/src/nsHRFrame.cpp b/mozilla/layout/html/base/src/nsHRFrame.cpp
index 947a46fe548..84455fb9b9a 100644
--- a/mozilla/layout/html/base/src/nsHRFrame.cpp
+++ b/mozilla/layout/html/base/src/nsHRFrame.cpp
@@ -80,7 +80,7 @@ HRuleFrame::Paint(nsIPresContext&      aPresContext,
                   const nsRect&        aDirtyRect,
                   nsFramePaintLayer    aWhichLayer)
 {
-  if (eFramePaintLayer_Content != aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) {
     return NS_OK;
   }
 
diff --git a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp
index b8ddf687815..b6d20510c5d 100644
--- a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp
+++ b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp
@@ -53,7 +53,7 @@ nsHTMLContainerFrame::Paint(nsIPresContext& aPresContext,
                             const nsRect& aDirtyRect,
                             nsFramePaintLayer aWhichLayer)
 {
-  if (eFramePaintLayer_Underlay == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) {
     const nsStyleDisplay* disp = (const nsStyleDisplay*)
       mStyleContext->GetStyleData(eStyleStruct_Display);
     if (disp->mVisible && mRect.width && mRect.height) {
diff --git a/mozilla/layout/html/base/src/nsImageFrame.cpp b/mozilla/layout/html/base/src/nsImageFrame.cpp
index 42525733857..70d38c79467 100644
--- a/mozilla/layout/html/base/src/nsImageFrame.cpp
+++ b/mozilla/layout/html/base/src/nsImageFrame.cpp
@@ -754,7 +754,7 @@ nsImageFrame::Paint(nsIPresContext& aPresContext,
     if (nsnull == image) {
       // No image yet, or image load failed. Draw the alt-text and an icon
       // indicating the status
-      if (eFramePaintLayer_Underlay == aWhichLayer) {
+      if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) {
         DisplayAltFeedback(aPresContext, aRenderingContext,
                            mImageLoader.GetLoadImageFailed()
                            ? NS_ICON_BROKEN_IMAGE
@@ -763,7 +763,7 @@ nsImageFrame::Paint(nsIPresContext& aPresContext,
       return NS_OK;
     }
 
-    if ((eFramePaintLayer_Content == aWhichLayer)
+    if ((NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer)
 #ifdef LET_IMAGE_LIBRARY_SCALE_ASPECT_IMAGES
         && mImageLoader.HaveImageSize()
 #endif
@@ -781,7 +781,7 @@ nsImageFrame::Paint(nsIPresContext& aPresContext,
       aRenderingContext.DrawImage(image, inner);
     }
 
-    if ((eFramePaintLayer_Overlay == aWhichLayer) && GetShowFrameBorders()) {
+    if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) {
       nsImageMap* map = GetImageMap();
       if (nsnull != map) {
         nsRect inner;
diff --git a/mozilla/layout/html/base/src/nsLeafFrame.cpp b/mozilla/layout/html/base/src/nsLeafFrame.cpp
index f3cc92676ad..2840e19832c 100644
--- a/mozilla/layout/html/base/src/nsLeafFrame.cpp
+++ b/mozilla/layout/html/base/src/nsLeafFrame.cpp
@@ -35,7 +35,7 @@ nsLeafFrame::Paint(nsIPresContext& aPresContext,
                    const nsRect& aDirtyRect,
                    nsFramePaintLayer aWhichLayer)
 {
-  if (eFramePaintLayer_Underlay == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) {
     const nsStyleDisplay* disp = (const nsStyleDisplay*)
       mStyleContext->GetStyleData(eStyleStruct_Display);
     if (disp->mVisible) {
diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp
index 41f8dd18fe5..2716c2c5a68 100644
--- a/mozilla/layout/html/base/src/nsObjectFrame.cpp
+++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp
@@ -1337,7 +1337,7 @@ nsObjectFrame::Paint(nsIPresContext& aPresContext,
     return NS_OK;
   }
 
-  if (eFramePaintLayer_Content == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) {
     const nsStyleFont* font = (const nsStyleFont*)
       mStyleContext->GetStyleData(eStyleStruct_Font);
 
@@ -1360,7 +1360,7 @@ nsObjectFrame::Paint(nsIPresContext& aPresContext,
   }
 #else
   // delegate all painting to the plugin instance.
-  if (eFramePaintLayer_Content == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) {
     mInstanceOwner->Paint(aDirtyRect);
   }
 #endif /* !XP_MAC */
diff --git a/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp b/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp
index 5e8cbf25910..5288d2ca216 100644
--- a/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp
+++ b/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp
@@ -73,7 +73,7 @@ nsPlaceholderFrame::Paint(nsIPresContext& aPresContext,
                           const nsRect& aDirtyRect,
                           nsFramePaintLayer aWhichLayer)
 {
-  if ((eFramePaintLayer_Overlay == aWhichLayer) && GetShowFrameBorders()) {
+  if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) {
     float p2t;
     aPresContext.GetPixelsToTwips(&p2t);
     aRenderingContext.SetColor(NS_RGB(0, 255, 255));
diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp
index 0c8b60c126a..56e3125fb80 100644
--- a/mozilla/layout/html/base/src/nsPresShell.cpp
+++ b/mozilla/layout/html/base/src/nsPresShell.cpp
@@ -1929,11 +1929,11 @@ PresShell::Paint(nsIView              *aView,
 
   if (nsnull != frame) {
     rv = frame->Paint(*mPresContext, aRenderingContext, aDirtyRect,
-                      eFramePaintLayer_Underlay);
+                      NS_FRAME_PAINT_LAYER_BACKGROUND);
     rv = frame->Paint(*mPresContext, aRenderingContext, aDirtyRect,
-                      eFramePaintLayer_Content);
+                      NS_FRAME_PAINT_LAYER_FLOATERS);
     rv = frame->Paint(*mPresContext, aRenderingContext, aDirtyRect,
-                      eFramePaintLayer_Overlay);
+                      NS_FRAME_PAINT_LAYER_FOREGROUND);
 #ifdef NS_DEBUG
     // Draw a border around the frame
     if (nsIFrame::GetShowFrameBorders()) {
diff --git a/mozilla/layout/html/base/src/nsScrollFrame.cpp b/mozilla/layout/html/base/src/nsScrollFrame.cpp
index 6116a7c71b1..00a38b33660 100644
--- a/mozilla/layout/html/base/src/nsScrollFrame.cpp
+++ b/mozilla/layout/html/base/src/nsScrollFrame.cpp
@@ -549,7 +549,7 @@ nsScrollFrame::Paint(nsIPresContext&      aPresContext,
                      const nsRect&        aDirtyRect,
                      nsFramePaintLayer    aWhichLayer)
 {
-  if (eFramePaintLayer_Underlay == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) {
     // Only paint the border and background if we're visible
     const nsStyleDisplay* display = (const nsStyleDisplay*)
       mStyleContext->GetStyleData(eStyleStruct_Display);
diff --git a/mozilla/layout/html/base/src/nsSimplePageSequence.cpp b/mozilla/layout/html/base/src/nsSimplePageSequence.cpp
index 4e6a1939c44..ffeee65d43e 100644
--- a/mozilla/layout/html/base/src/nsSimplePageSequence.cpp
+++ b/mozilla/layout/html/base/src/nsSimplePageSequence.cpp
@@ -277,7 +277,7 @@ nsSimplePageSequenceFrame::Paint(nsIPresContext&      aPresContext,
                                  const nsRect&        aDirtyRect,
                                  nsFramePaintLayer    aWhichLayer)
 {
-  if (eFramePaintLayer_Underlay == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) {
     // Paint a white background
     aRenderingContext.SetColor(NS_RGB(255,255,255));
     aRenderingContext.FillRect(aDirtyRect);
@@ -299,7 +299,7 @@ nsSimplePageSequenceFrame::PaintChild(nsIPresContext&      aPresContext,
   nsContainerFrame::PaintChild(aPresContext, aRenderingContext,
                                aDirtyRect, aFrame, aWhichLayer);
 
-  if (eFramePaintLayer_Overlay == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) {
     // XXX Paint a one-pixel border around the page so it's easy to see where
     // each page begins and ends when we're in print preview mode
     nsRect  pageBounds;
diff --git a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp
index df5f7560b5c..a01167da568 100644
--- a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp
+++ b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp
@@ -1568,7 +1568,7 @@ nsHTMLFramesetBorderFrame::Paint(nsIPresContext&      aPresContext,
                                  const nsRect&        aDirtyRect,
                                  nsFramePaintLayer    aWhichLayer)
 {
-  if (eFramePaintLayer_Content != aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) {
     return NS_OK;
   }
   //printf("border frame paint %X (%d,%d,%d,%d) \n", this, aDirtyRect.x, aDirtyRect.y, aDirtyRect.width, aDirtyRect.height);
@@ -1740,7 +1740,7 @@ nsHTMLFramesetBlankFrame::Paint(nsIPresContext&      aPresContext,
                                 const nsRect&        aDirtyRect,
                                 nsFramePaintLayer    aWhichLayer)
 {
-  if (eFramePaintLayer_Content != aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) {
     return NS_OK;
   }
   nscolor white = NS_RGB(255,255,255);
diff --git a/mozilla/layout/html/forms/src/nsButtonControlFrame.cpp b/mozilla/layout/html/forms/src/nsButtonControlFrame.cpp
index 1ee6d33b3c3..d55f7b87c12 100644
--- a/mozilla/layout/html/forms/src/nsButtonControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsButtonControlFrame.cpp
@@ -269,7 +269,7 @@ nsButtonControlFrame::Paint(nsIPresContext& aPresContext,
     nsRect rect(0, 0, mRect.width, mRect.height);
     mRenderer.PaintButton(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer, rect);
 
-    if (eFramePaintLayer_Content == aWhichLayer) {
+    if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) {
 	    nsString label;
 	    nsresult result = GetValue(&label);
 
diff --git a/mozilla/layout/html/forms/src/nsButtonFrameRenderer.cpp b/mozilla/layout/html/forms/src/nsButtonFrameRenderer.cpp
index 7e34bb5de16..446c8b87f75 100644
--- a/mozilla/layout/html/forms/src/nsButtonFrameRenderer.cpp
+++ b/mozilla/layout/html/forms/src/nsButtonFrameRenderer.cpp
@@ -334,7 +334,7 @@ nsButtonFrameRenderer::PaintOutlineAndFocusBorders(nsIPresContext& aPresContext,
 
 	nsRect rect;
 
-    if (eFramePaintLayer_Underlay == aWhichLayer) 
+    if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) 
 	{
 
 		if (mOuterFocusStyle) {
@@ -360,7 +360,7 @@ nsButtonFrameRenderer::PaintOutlineAndFocusBorders(nsIPresContext& aPresContext,
 		}
 	}
 
-    if (eFramePaintLayer_Overlay == aWhichLayer) 
+    if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) 
 	{
 		if /*(mOutlineStyle) */ (PR_FALSE) {
 
@@ -391,7 +391,7 @@ nsButtonFrameRenderer::PaintBorderAndBackground(nsIPresContext& aPresContext,
 
 {
 
-    if (eFramePaintLayer_Underlay != aWhichLayer) 
+    if (NS_FRAME_PAINT_LAYER_BACKGROUND != aWhichLayer) 
 	   return;
 
 	// get the button rect this is inside the focus and outline rects
diff --git a/mozilla/layout/html/forms/src/nsCheckboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsCheckboxControlFrame.cpp
index e9e0e8a5e6b..761db776834 100644
--- a/mozilla/layout/html/forms/src/nsCheckboxControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsCheckboxControlFrame.cpp
@@ -345,7 +345,7 @@ nsCheckboxControlFrame::Paint(nsIPresContext& aPresContext,
 {
     // Paint the background
   nsFormControlFrame::Paint(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer);
-  if (eFramePaintLayer_Content == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) {
       // Paint the checkmark 
     PaintCheckBox(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer);
   }
diff --git a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
index abd0c74fb62..31ca31fa35b 100644
--- a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
@@ -571,7 +571,7 @@ nsComboboxControlFrame::Paint(nsIPresContext& aPresContext,
                           const nsRect& aDirtyRect,
                           nsFramePaintLayer aWhichLayer)
 {
-  if (eFramePaintLayer_Content == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) {
     PaintComboboxControl(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer);
   }
   return NS_OK;
diff --git a/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp b/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp
index f20243cea7b..462e3a00247 100644
--- a/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp
@@ -178,7 +178,7 @@ nsFieldSetFrame::Paint(nsIPresContext& aPresContext,
                        const nsRect& aDirtyRect,
                        nsFramePaintLayer aWhichLayer)
 {
-  if (eFramePaintLayer_Underlay == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) {
     // Paint our background and border
     const nsStyleDisplay* disp =
       (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display);
@@ -213,7 +213,7 @@ nsFieldSetFrame::Paint(nsIPresContext& aPresContext,
 
   PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer);
 
-  if ((eFramePaintLayer_Overlay == aWhichLayer) && GetShowFrameBorders()) {
+  if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) {
     nsIView* view;
     GetView(&view);
     if (nsnull != view) {
diff --git a/mozilla/layout/html/forms/src/nsFileControlFrame.cpp b/mozilla/layout/html/forms/src/nsFileControlFrame.cpp
index b0629e30ab2..9f28dedc6dd 100644
--- a/mozilla/layout/html/forms/src/nsFileControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsFileControlFrame.cpp
@@ -463,7 +463,7 @@ nsFileControlFrame::Paint(nsIPresContext& aPresContext,
 
   mTextFrame->PaintTextControlBackground(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer);
 
-  if (eFramePaintLayer_Content == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) {
     nsString text;
     if (NS_SUCCEEDED(nsFormControlHelper::GetInputElementValue(mContent, &text, PR_FALSE))) {
       nsRect rect;
diff --git a/mozilla/layout/html/forms/src/nsRadioControlFrame.cpp b/mozilla/layout/html/forms/src/nsRadioControlFrame.cpp
index 843c4fa6172..71a80765829 100644
--- a/mozilla/layout/html/forms/src/nsRadioControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsRadioControlFrame.cpp
@@ -387,7 +387,7 @@ nsRadioControlFrame::Paint(nsIPresContext& aPresContext,
                            const nsRect& aDirtyRect,
                            nsFramePaintLayer aWhichLayer)
 {
-  if (eFramePaintLayer_Content == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) {
     PaintRadioButton(aPresContext, aRenderingContext, aDirtyRect);
   }
   return NS_OK;
diff --git a/mozilla/layout/html/forms/src/nsSelectControlFrame.cpp b/mozilla/layout/html/forms/src/nsSelectControlFrame.cpp
index 99d252416da..466b31ce6c3 100644
--- a/mozilla/layout/html/forms/src/nsSelectControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsSelectControlFrame.cpp
@@ -996,7 +996,7 @@ nsSelectControlFrame::Paint(nsIPresContext& aPresContext,
 {
   nsFormControlFrame::Paint(aPresContext, aRenderingContext, aDirtyRect,
                             aWhichLayer);
-  if (eFramePaintLayer_Content == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) {
     PaintSelectControl(aPresContext, aRenderingContext, aDirtyRect);
   }
   return NS_OK;
diff --git a/mozilla/layout/html/forms/src/nsTextControlFrame.cpp b/mozilla/layout/html/forms/src/nsTextControlFrame.cpp
index 93cac882f1d..1c3b90045d6 100644
--- a/mozilla/layout/html/forms/src/nsTextControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsTextControlFrame.cpp
@@ -804,7 +804,7 @@ nsTextControlFrame::Paint(nsIPresContext& aPresContext,
                           nsFramePaintLayer aWhichLayer)
 {
   PaintTextControlBackground(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer);
-  if (eFramePaintLayer_Content == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) {
     nsString text;
     GetText(&text, PR_FALSE);
     nsRect rect(0, 0, mRect.width, mRect.height);
diff --git a/mozilla/layout/html/table/src/nsTableCellFrame.cpp b/mozilla/layout/html/table/src/nsTableCellFrame.cpp
index e14aac0b0e1..8c44f3c1e86 100644
--- a/mozilla/layout/html/table/src/nsTableCellFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableCellFrame.cpp
@@ -133,7 +133,7 @@ NS_METHOD nsTableCellFrame::Paint(nsIPresContext& aPresContext,
                                   const nsRect& aDirtyRect,
                                   nsFramePaintLayer aWhichLayer)
 {
-  if (eFramePaintLayer_Underlay == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) {
     const nsStyleDisplay* disp =
       (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display);
 
@@ -184,7 +184,7 @@ NS_METHOD nsTableCellFrame::Paint(nsIPresContext& aPresContext,
   }
 
   // for debug...
-  if ((eFramePaintLayer_Overlay == aWhichLayer) && GetShowFrameBorders()) {
+  if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) {
     aRenderingContext.SetColor(NS_RGB(0, 0, 128));
     aRenderingContext.DrawRect(0, 0, mRect.width, mRect.height);
   }
diff --git a/mozilla/layout/html/table/src/nsTableFrame.cpp b/mozilla/layout/html/table/src/nsTableFrame.cpp
index 918a923bb3b..6ad9d019e8b 100644
--- a/mozilla/layout/html/table/src/nsTableFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableFrame.cpp
@@ -2278,7 +2278,7 @@ NS_METHOD nsTableFrame::Paint(nsIPresContext& aPresContext,
                               nsFramePaintLayer aWhichLayer)
 {
   // table paint code is concerned primarily with borders and bg color
-  if (eFramePaintLayer_Underlay == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) {
     const nsStyleDisplay* disp =
       (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display);
     if (disp->mVisible) {
@@ -2307,7 +2307,7 @@ NS_METHOD nsTableFrame::Paint(nsIPresContext& aPresContext,
     }
   }
   // for debug...
-  if ((eFramePaintLayer_Overlay == aWhichLayer) && GetShowFrameBorders()) {
+  if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) {
     aRenderingContext.SetColor(NS_RGB(0,255,0));
     aRenderingContext.DrawRect(0, 0, mRect.width, mRect.height);
   }
diff --git a/mozilla/layout/html/table/src/nsTableOuterFrame.cpp b/mozilla/layout/html/table/src/nsTableOuterFrame.cpp
index 84c7ba75c5c..710529fb43d 100644
--- a/mozilla/layout/html/table/src/nsTableOuterFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableOuterFrame.cpp
@@ -130,7 +130,7 @@ NS_METHOD nsTableOuterFrame::Paint(nsIPresContext& aPresContext,
                                    nsFramePaintLayer aWhichLayer)
 {
   // for debug...
-  if ((eFramePaintLayer_Overlay == aWhichLayer) && GetShowFrameBorders()) {
+  if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) {
     aRenderingContext.SetColor(NS_RGB(255,0,0));
     aRenderingContext.DrawRect(0, 0, mRect.width, mRect.height);
   }
diff --git a/mozilla/layout/html/table/src/nsTableRowFrame.cpp b/mozilla/layout/html/table/src/nsTableRowFrame.cpp
index f64499b78c8..3376c23ffed 100644
--- a/mozilla/layout/html/table/src/nsTableRowFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableRowFrame.cpp
@@ -346,7 +346,7 @@ void nsTableRowFrame::PaintChildren(nsIPresContext&      aPresContext,
         aRenderingContext.Translate(kidRect.x, kidRect.y);
         kid->Paint(aPresContext, aRenderingContext, kidDamageArea,
                    aWhichLayer);
-        if ((eFramePaintLayer_Overlay == aWhichLayer) &&
+        if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) &&
             GetShowFrameBorders()) {
           aRenderingContext.SetColor(NS_RGB(255,0,0));
           aRenderingContext.DrawRect(0, 0, kidRect.width, kidRect.height);
diff --git a/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp b/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp
index 2da9714675d..779dba7411e 100644
--- a/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp
@@ -286,7 +286,8 @@ void nsTableRowGroupFrame::PaintChildren(nsIPresContext&      aPresContext,
       aRenderingContext.PushState();
       aRenderingContext.Translate(kidRect.x, kidRect.y);
       kid->Paint(aPresContext, aRenderingContext, kidDamageArea, aWhichLayer);
-      if ((eFramePaintLayer_Overlay == aWhichLayer) && GetShowFrameBorders()) {
+      if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) &&
+          GetShowFrameBorders()) {
         aRenderingContext.SetColor(NS_RGB(255,0,0));
         aRenderingContext.DrawRect(0, 0, kidRect.width, kidRect.height);
       }
diff --git a/mozilla/layout/tables/nsTableCellFrame.cpp b/mozilla/layout/tables/nsTableCellFrame.cpp
index e14aac0b0e1..8c44f3c1e86 100644
--- a/mozilla/layout/tables/nsTableCellFrame.cpp
+++ b/mozilla/layout/tables/nsTableCellFrame.cpp
@@ -133,7 +133,7 @@ NS_METHOD nsTableCellFrame::Paint(nsIPresContext& aPresContext,
                                   const nsRect& aDirtyRect,
                                   nsFramePaintLayer aWhichLayer)
 {
-  if (eFramePaintLayer_Underlay == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) {
     const nsStyleDisplay* disp =
       (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display);
 
@@ -184,7 +184,7 @@ NS_METHOD nsTableCellFrame::Paint(nsIPresContext& aPresContext,
   }
 
   // for debug...
-  if ((eFramePaintLayer_Overlay == aWhichLayer) && GetShowFrameBorders()) {
+  if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) {
     aRenderingContext.SetColor(NS_RGB(0, 0, 128));
     aRenderingContext.DrawRect(0, 0, mRect.width, mRect.height);
   }
diff --git a/mozilla/layout/tables/nsTableFrame.cpp b/mozilla/layout/tables/nsTableFrame.cpp
index 918a923bb3b..6ad9d019e8b 100644
--- a/mozilla/layout/tables/nsTableFrame.cpp
+++ b/mozilla/layout/tables/nsTableFrame.cpp
@@ -2278,7 +2278,7 @@ NS_METHOD nsTableFrame::Paint(nsIPresContext& aPresContext,
                               nsFramePaintLayer aWhichLayer)
 {
   // table paint code is concerned primarily with borders and bg color
-  if (eFramePaintLayer_Underlay == aWhichLayer) {
+  if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) {
     const nsStyleDisplay* disp =
       (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display);
     if (disp->mVisible) {
@@ -2307,7 +2307,7 @@ NS_METHOD nsTableFrame::Paint(nsIPresContext& aPresContext,
     }
   }
   // for debug...
-  if ((eFramePaintLayer_Overlay == aWhichLayer) && GetShowFrameBorders()) {
+  if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) {
     aRenderingContext.SetColor(NS_RGB(0,255,0));
     aRenderingContext.DrawRect(0, 0, mRect.width, mRect.height);
   }
diff --git a/mozilla/layout/tables/nsTableOuterFrame.cpp b/mozilla/layout/tables/nsTableOuterFrame.cpp
index 84c7ba75c5c..710529fb43d 100644
--- a/mozilla/layout/tables/nsTableOuterFrame.cpp
+++ b/mozilla/layout/tables/nsTableOuterFrame.cpp
@@ -130,7 +130,7 @@ NS_METHOD nsTableOuterFrame::Paint(nsIPresContext& aPresContext,
                                    nsFramePaintLayer aWhichLayer)
 {
   // for debug...
-  if ((eFramePaintLayer_Overlay == aWhichLayer) && GetShowFrameBorders()) {
+  if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) {
     aRenderingContext.SetColor(NS_RGB(255,0,0));
     aRenderingContext.DrawRect(0, 0, mRect.width, mRect.height);
   }
diff --git a/mozilla/layout/tables/nsTableRowFrame.cpp b/mozilla/layout/tables/nsTableRowFrame.cpp
index f64499b78c8..3376c23ffed 100644
--- a/mozilla/layout/tables/nsTableRowFrame.cpp
+++ b/mozilla/layout/tables/nsTableRowFrame.cpp
@@ -346,7 +346,7 @@ void nsTableRowFrame::PaintChildren(nsIPresContext&      aPresContext,
         aRenderingContext.Translate(kidRect.x, kidRect.y);
         kid->Paint(aPresContext, aRenderingContext, kidDamageArea,
                    aWhichLayer);
-        if ((eFramePaintLayer_Overlay == aWhichLayer) &&
+        if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) &&
             GetShowFrameBorders()) {
           aRenderingContext.SetColor(NS_RGB(255,0,0));
           aRenderingContext.DrawRect(0, 0, kidRect.width, kidRect.height);
diff --git a/mozilla/layout/tables/nsTableRowGroupFrame.cpp b/mozilla/layout/tables/nsTableRowGroupFrame.cpp
index 2da9714675d..779dba7411e 100644
--- a/mozilla/layout/tables/nsTableRowGroupFrame.cpp
+++ b/mozilla/layout/tables/nsTableRowGroupFrame.cpp
@@ -286,7 +286,8 @@ void nsTableRowGroupFrame::PaintChildren(nsIPresContext&      aPresContext,
       aRenderingContext.PushState();
       aRenderingContext.Translate(kidRect.x, kidRect.y);
       kid->Paint(aPresContext, aRenderingContext, kidDamageArea, aWhichLayer);
-      if ((eFramePaintLayer_Overlay == aWhichLayer) && GetShowFrameBorders()) {
+      if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) &&
+          GetShowFrameBorders()) {
         aRenderingContext.SetColor(NS_RGB(255,0,0));
         aRenderingContext.DrawRect(0, 0, kidRect.width, kidRect.height);
       }