Bug 1425841 - don't call gdk_x11_window_get_xid() at LOG() on Wayland, r=jhorak
authorMartin Stransky <stransky@redhat.com>
Mon, 18 Dec 2017 15:50:57 +0100
changeset 449081 6f1f9f585d3aa0b8ee83b887731798f9172fb20d
parent 449042 85b81d55503afb676760251f3a4f109528836f79
child 449082 8f0367c9a53aeca41c5eb1d03b09a2365a7a88b1
push id8527
push userCallek@gmail.com
push dateThu, 11 Jan 2018 21:05:50 +0000
treeherdermozilla-beta@95342d212a7a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjhorak
bugs1425841
milestone59.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
Bug 1425841 - don't call gdk_x11_window_get_xid() at LOG() on Wayland, r=jhorak MozReview-Commit-ID: BzIzqE2I3Si
widget/gtk/nsWindow.cpp
--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
@@ -2135,17 +2135,17 @@ nsWindow::OnExposeEvent(cairo_t *cr)
 
     if (GetLayerManager()->AsKnowsCompositor() && GetLayerManager()->NeedsComposite()) {
       GetLayerManager()->ScheduleComposite();
       GetLayerManager()->SetNeedsComposite(false);
     }
 
     LOGDRAW(("sending expose event [%p] %p 0x%lx (rects follow):\n",
              (void *)this, (void *)mGdkWindow,
-             gdk_x11_window_get_xid(mGdkWindow)));
+             mIsX11Display ? gdk_x11_window_get_xid(mGdkWindow) : 0));
 
     // Our bounds may have changed after calling WillPaintWindow.  Clip
     // to the new bounds here.  The region is relative to this
     // window.
     region.And(region, LayoutDeviceIntRect(0, 0, mBounds.width, mBounds.height));
 
     bool shaped = false;
     if (eTransparencyTransparent == GetTransparencyMode()) {
@@ -4039,17 +4039,17 @@ nsWindow::Create(nsIWidget* aParent,
                          G_CALLBACK(touch_event_cb), nullptr);
 #endif
     }
 
     LOG(("nsWindow [%p]\n", (void *)this));
     if (mShell) {
         LOG(("\tmShell %p mContainer %p mGdkWindow %p 0x%lx\n",
              mShell, mContainer, mGdkWindow,
-             gdk_x11_window_get_xid(mGdkWindow)));
+             mIsX11Display ? gdk_x11_window_get_xid(mGdkWindow) : 0));
     } else if (mContainer) {
         LOG(("\tmContainer %p mGdkWindow %p\n", mContainer, mGdkWindow));
     }
     else if (mGdkWindow) {
         LOG(("\tmGdkWindow %p parent %p\n",
              mGdkWindow, gdk_window_get_parent(mGdkWindow)));
     }