From f7967cae61ba904154dbf28c2e7dad5b9101bb64 Mon Sep 17 00:00:00 2001
From: "rods%netscape.com" <rods%netscape.com>
Date: Tue, 12 Feb 2002 13:35:59 +0000
Subject: [PATCH] Clip was being incorrectly set set as Replace instead of
 Intersect Bug 84138 r=kmcclusk sr=attinasi

---
 layout/forms/nsComboboxControlFrame.cpp          | 2 +-
 layout/html/forms/src/nsComboboxControlFrame.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp
index 0b63dee41bb1..6161004bb9ea 100644
--- a/layout/forms/nsComboboxControlFrame.cpp
+++ b/layout/forms/nsComboboxControlFrame.cpp
@@ -2540,7 +2540,7 @@ nsComboboxControlFrame::Paint(nsIPresContext*     aPresContext,
       PRBool clipEmpty;
       nsRect clipRect;
       mDisplayFrame->GetRect(clipRect);
-      aRenderingContext.SetClipRect(clipRect, nsClipCombine_kReplace, clipEmpty);
+      aRenderingContext.SetClipRect(clipRect, nsClipCombine_kIntersect, clipEmpty);
       PaintChild(aPresContext, aRenderingContext, aDirtyRect, 
                  mDisplayFrame, NS_FRAME_PAINT_LAYER_BACKGROUND);
       PaintChild(aPresContext, aRenderingContext, aDirtyRect, 
diff --git a/layout/html/forms/src/nsComboboxControlFrame.cpp b/layout/html/forms/src/nsComboboxControlFrame.cpp
index 0b63dee41bb1..6161004bb9ea 100644
--- a/layout/html/forms/src/nsComboboxControlFrame.cpp
+++ b/layout/html/forms/src/nsComboboxControlFrame.cpp
@@ -2540,7 +2540,7 @@ nsComboboxControlFrame::Paint(nsIPresContext*     aPresContext,
       PRBool clipEmpty;
       nsRect clipRect;
       mDisplayFrame->GetRect(clipRect);
-      aRenderingContext.SetClipRect(clipRect, nsClipCombine_kReplace, clipEmpty);
+      aRenderingContext.SetClipRect(clipRect, nsClipCombine_kIntersect, clipEmpty);
       PaintChild(aPresContext, aRenderingContext, aDirtyRect, 
                  mDisplayFrame, NS_FRAME_PAINT_LAYER_BACKGROUND);
       PaintChild(aPresContext, aRenderingContext, aDirtyRect,