b=793501 don't log child window XIDs as this has the side effect of creating X Windows early r=roc
authorKarl Tomlinson <karlt+@karlt.net>
Tue, 23 Oct 2012 11:40:24 +1300
changeset 111236 1c2eaa7e3edd494847197f380c9d3c8e3acde309
parent 111235 9541dbf6e0208e58c0c0794c4a97f25b2f57b987
child 111237 8da9c24417d07c87a8006a170efc2bfae0825512
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
reviewersroc
bugs793501
milestone19.0a1
b=793501 don't log child window XIDs as this has the side effect of creating X Windows early r=roc
widget/gtk2/nsWindow.cpp
--- a/widget/gtk2/nsWindow.cpp
+++ b/widget/gtk2/nsWindow.cpp
@@ -3762,28 +3762,25 @@ nsWindow::Create(nsIWidget        *aPare
         g_signal_connect(eventWidget, "button-release-event",
                          G_CALLBACK(button_release_event_cb), NULL);
         g_signal_connect(eventWidget, "scroll-event",
                          G_CALLBACK(scroll_event_cb), NULL);
     }
 
     LOG(("nsWindow [%p]\n", (void *)this));
     if (mShell) {
-        LOG(("\tmShell %p %p %lx\n", (void *)mShell, (void *)gtk_widget_get_window(mShell),
-             gdk_x11_window_get_xid(gtk_widget_get_window(mShell))));
-    }
-
-    if (mContainer) {
-        LOG(("\tmContainer %p %p %lx\n", (void *)mContainer,
-             (void *)gtk_widget_get_window(GTK_WIDGET(mContainer)),
-             gdk_x11_window_get_xid(gtk_widget_get_window(GTK_WIDGET(mContainer)))));
+        LOG(("\tmShell %p mContainer %p mGdkWindow %p 0x%lx\n",
+             mShell, mContainer, mGdkWindow,
+             gdk_x11_window_get_xid(mGdkWindow)));
+    } else if (mContainer) {
+        LOG(("\tmContainer %p mGdkWindow %p\n", mContainer, mGdkWindow));
     }
     else if (mGdkWindow) {
-        LOG(("\tmGdkWindow %p %lx\n", (void *)mGdkWindow,
-             gdk_x11_window_get_xid(mGdkWindow)));
+        LOG(("\tmGdkWindow %p parent %p\n",
+             mGdkWindow, gdk_window_get_parent(mGdkWindow)));
     }
 
     // resize so that everything is set to the right dimensions
     if (!mIsTopLevel)
         Resize(mBounds.x, mBounds.y, mBounds.width, mBounds.height, false);
 
     return NS_OK;
 }