From c4775ee642a939c747ecaae11535aee69716db9d Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Wed, 20 Nov 2019 04:32:43 +0000
Subject: [PATCH] Bug 1469716 provide identifying handles in
 CreateWindowSurface() log messages r=rhunt

These identifiers can be compared with messages from logging from nsWindow.

Also clarify that this log is not intended to indicate each draw.

Differential Revision: https://phabricator.services.mozilla.com/D53387

--HG--
extra : moz-landing-system : lando
---
 widget/gtk/WindowSurfaceProvider.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/widget/gtk/WindowSurfaceProvider.cpp b/widget/gtk/WindowSurfaceProvider.cpp
index 4e1a755503c3..2b9130863b6d 100644
--- a/widget/gtk/WindowSurfaceProvider.cpp
+++ b/widget/gtk/WindowSurfaceProvider.cpp
@@ -65,7 +65,7 @@ void WindowSurfaceProvider::CleanupResources() { mWindowSurface = nullptr; }
 UniquePtr<WindowSurface> WindowSurfaceProvider::CreateWindowSurface() {
 #ifdef MOZ_WAYLAND
   if (!mIsX11Display) {
-    LOGDRAW(("Drawing to nsWindow %p using wl_surface\n", (void*)this));
+    LOGDRAW(("Drawing to nsWindow %p will use wl_surface\n", mWidget));
     return MakeUnique<WindowSurfaceWayland>(mWidget);
   }
 #endif
@@ -80,7 +80,7 @@ UniquePtr<WindowSurface> WindowSurfaceProvider::CreateWindowSurface() {
 
 #ifdef MOZ_WIDGET_GTK
   if (!mIsShaped && gfxVars::UseXRender()) {
-    LOGDRAW(("Drawing to nsWindow %p using XRender\n", (void*)this));
+    LOGDRAW(("Drawing to Window 0x%lx will use XRender\n", mXWindow));
     return MakeUnique<WindowSurfaceXRender>(mXDisplay, mXWindow, mXVisual,
                                             mXDepth);
   }
@@ -88,13 +88,13 @@ UniquePtr<WindowSurface> WindowSurfaceProvider::CreateWindowSurface() {
 
 #ifdef MOZ_HAVE_SHMIMAGE
   if (!mIsShaped && nsShmImage::UseShm()) {
-    LOGDRAW(("Drawing to nsWindow %p using MIT-SHM\n", (void*)this));
+    LOGDRAW(("Drawing to Window 0x%lx will use MIT-SHM\n", mXWindow));
     return MakeUnique<WindowSurfaceX11SHM>(mXDisplay, mXWindow, mXVisual,
                                            mXDepth);
   }
 #endif  // MOZ_HAVE_SHMIMAGE
 
-  LOGDRAW(("Drawing to nsWindow %p using XPutImage\n", (void*)this));
+  LOGDRAW(("Drawing to Window 0x%lx will use XPutImage\n", mXWindow));
   return MakeUnique<WindowSurfaceX11Image>(mXDisplay, mXWindow, mXVisual,
                                            mXDepth, mIsShaped);
 }