Backout b100957a878e (bug 802316) for maybe causing intermittent orange. a=backout
authorTimothy Nikkel <tnikkel@gmail.com>
Thu, 25 Oct 2012 02:40:04 -0500
changeset 116332 729dda93df1e21473c284cd053a98a99fb34e5ba
parent 116331 9bdf55feececcbeedee11b1deacad0120e419d66
child 116333 fd8361463029a0648cf988548e3758734ae459f9
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
bugs802316
milestone18.0a2
backs outb100957a878e4d49c3718b5e2c4f3197fbe6d83a
Backout b100957a878e (bug 802316) for maybe causing intermittent orange. a=backout
widget/windows/nsWindow.cpp
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -1075,23 +1075,16 @@ NS_METHOD nsWindow::Show(bool bState)
         sDropShadowEnabled = false;
       }
     } else {
       if (!sDropShadowEnabled) {
         ::SetClassLongA(mWnd, GCL_STYLE, CS_DROPSHADOW);
         sDropShadowEnabled = true;
       }
     }
-
-    // WS_EX_COMPOSITED conflicts with the WS_EX_LAYERED style and causes
-    // some popup menus to become invisible.
-    LONG_PTR exStyle = ::GetWindowLongPtrW(mWnd, GWL_EXSTYLE);
-    if (exStyle & WS_EX_LAYERED) {
-      ::SetWindowLongPtrW(mWnd, GWL_EXSTYLE, exStyle & ~WS_EX_COMPOSITED);
-    }
   }
 
   bool syncInvalidate = false;
 
   bool wasVisible = mIsVisible;
   // Set the status now so that anyone asking during ShowWindow or
   // SetWindowPos would get the correct answer.
   mIsVisible = bState;