From 7439b6827bf50229060745d9ff1e856915e4d8ba Mon Sep 17 00:00:00 2001
From: Kai Liu <kliu@mozilla.kailiu.com>
Date: Sat, 12 Jul 2008 11:08:23 +0200
Subject: [PATCH] =?UTF-8?q?Bug=20441034=20=E2=80=93=20Unfocused=20<select>?=
 =?UTF-8?q?=20arrow-button=20has=20transparent=20background.=20r=3Dvlad?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 widget/src/windows/nsNativeThemeWin.cpp | 33 +++++++++++++++----------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/widget/src/windows/nsNativeThemeWin.cpp b/widget/src/windows/nsNativeThemeWin.cpp
index 45a36dbadb18..f27ca3fe42a9 100644
--- a/widget/src/windows/nsNativeThemeWin.cpp
+++ b/widget/src/windows/nsNativeThemeWin.cpp
@@ -1091,6 +1091,12 @@ nsNativeThemeWin::GetThemePartAndState(nsIFrame* aFrame, PRUint8 aWidgetType,
 
       aPart = mIsVistaOrLater ? CBP_DROPMARKER_VISTA : CBP_DROPMARKER;
 
+      // For HTML controls with author styling, we should fall
+      // back to the old dropmarker style to avoid clashes with
+      // author-specified backgrounds and borders (bug #441034)
+      if (isHTML && IsWidgetStyled(aFrame->PresContext(), aFrame, NS_THEME_DROPDOWN))
+        aPart = CBP_DROPMARKER;
+
       if (IsDisabled(aFrame)) {
         aState = TS_DISABLED;
         return NS_OK;
@@ -1247,19 +1253,17 @@ nsNativeThemeWin::DrawWidgetBackground(nsIRenderingContext* aContext,
   tr.ScaleInverse(p2a);
   cr.ScaleInverse(p2a);
 
-  if (mIsVistaOrLater) {
-    /* See GetWidgetOverflow */
-    if (aWidgetType == NS_THEME_DROPDOWN_BUTTON &&
-        IsHTMLContent(aFrame))
-    {
-      tr.pos.y -= 1.0;
-      tr.size.width += 1.0;
-      tr.size.height += 2.0;
+  /* See GetWidgetOverflow */
+  if (aWidgetType == NS_THEME_DROPDOWN_BUTTON &&
+      part == CBP_DROPMARKER_VISTA && IsHTMLContent(aFrame))
+  {
+    tr.pos.y -= 1.0;
+    tr.size.width += 1.0;
+    tr.size.height += 2.0;
 
-      cr.pos.y -= 1.0;
-      cr.size.width += 1.0;
-      cr.size.height += 2.0;
-    }
+    cr.pos.y -= 1.0;
+    cr.size.width += 1.0;
+    cr.size.height += 2.0;
   }
 
   nsRefPtr<gfxContext> ctx = aContext->ThebesContext();
@@ -1648,7 +1652,10 @@ nsNativeThemeWin::GetWidgetOverflow(nsIDeviceContext* aContext,
      * like they're supposed to.
      */
     if (aWidgetType == NS_THEME_DROPDOWN_BUTTON &&
-        IsHTMLContent(aFrame))
+        IsHTMLContent(aFrame) &&
+        !IsWidgetStyled(aFrame->GetParent()->PresContext(),
+                        aFrame->GetParent(),
+                        NS_THEME_DROPDOWN))
     {
       PRInt32 p2a = aContext->AppUnitsPerDevPixel();
       /* Note: no overflow on the left */