b=408284 no need to apply transparency bitmap on each show r=roc
authorKarl Tomlinson <karlt+@karlt.net>
Wed, 03 Oct 2012 11:36:08 +1300
changeset 109097 6552072432a28500932ccadf9391cf42af72ce3d
parent 109096 7f2eac1712ef13792816d84f24bd5667b6167dd6
child 109098 f42211cc87cd4804960cf84ef2dc14919f45b8de
push id15846
push userktomlinson@mozilla.com
push dateWed, 03 Oct 2012 18:37:00 +0000
treeherdermozilla-inbound@b2fd5b6ca0d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs408284
milestone18.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
b=408284 no need to apply transparency bitmap on each show r=roc
widget/gtk2/nsWindow.cpp
--- a/widget/gtk2/nsWindow.cpp
+++ b/widget/gtk2/nsWindow.cpp
@@ -3846,31 +3846,19 @@ nsWindow::NativeResize(int32_t aX, int32
         gtk_widget_size_allocate(GTK_WIDGET(mContainer), &allocation);
     }
     else if (mGdkWindow) {
         gdk_window_move_resize(mGdkWindow, aX, aY, aWidth, aHeight);
     }
 }
 
 void
-nsWindow::NativeShow (bool    aAction)
+nsWindow::NativeShow(bool aAction)
 {
     if (aAction) {
-        // GTK wants us to set the window mask before we show the window
-        // for the first time, or setting the mask later won't work.
-        // GTK also wants us to NOT set the window mask if we're not really
-        // going to need it, because GTK won't let us unset the mask properly
-        // later.
-        // So, we delay setting the mask until the last moment: when the window
-        // is shown.
-        // XXX that may or may not be true for GTK+ 2.x
-        if (mTransparencyBitmap) {
-            ApplyTransparencyBitmap();
-        }
-
         // unset our flag now that our window has been shown
         mNeedsShow = false;
 
         if (mIsTopLevel) {
             // Set up usertime/startupID metadata for the created window.
             if (mWindowType != eWindowType_invisible) {
                 SetUserTimeAndStartupIDForActivatedWindow(mShell);
             }