Backout 4af749bc6e82 (bug 802456) for maybe causing intermittent orange. a=backout
authorTimothy Nikkel <tnikkel@gmail.com>
Thu, 25 Oct 2012 02:41:37 -0500
changeset 116333 fd8361463029a0648cf988548e3758734ae459f9
parent 116332 729dda93df1e21473c284cd053a98a99fb34e5ba
child 116334 8e856706c7057b4f48d11ca910c68e37db8b4cc6
push id1708
push userakeybl@mozilla.com
push dateMon, 19 Nov 2012 21:10:21 +0000
treeherdermozilla-beta@27b14fe50103 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs802456
milestone18.0a2
backs out4af749bc6e826637d8fe2ee74b522efb2cfa6c7e
Backout 4af749bc6e82 (bug 802456) for maybe causing intermittent orange. a=backout
widget/windows/nsWindow.cpp
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -480,17 +480,18 @@ nsWindow::Create(nsIWidget *aParent,
   DWORD style = WindowStyle();
   DWORD extendedStyle = WindowExStyle();
 
   if (mWindowType == eWindowType_popup) {
     if (!aParent) {
       parent = NULL;
     }
 
-    if (WinUtils::GetWindowsVersion() >= WinUtils::VISTA_VERSION) {
+    if (WinUtils::GetWindowsVersion() >= WinUtils::VISTA_VERSION &&
+        mPopupType == ePopupTypeMenu && aInitData->mDropShadow) {
       extendedStyle |= WS_EX_COMPOSITED;
     }
 
     if (aInitData->mIsDragPopup) {
       // This flag makes the window transparent to mouse events
       extendedStyle |= WS_EX_TRANSPARENT;
     }
   } else if (mWindowType == eWindowType_invisible) {