From e986c9e88a0d51aa38dbc82ce771c03685bd3d9b Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Fri, 11 Sep 2026 10:30:01 +0000
Subject: [PATCH] Bug 2070806 [Linux] Init mMappedRegionData and move class
 members init to header r=emilio,gtk-reviewers,sylvestre

Differential Revision: https://phabricator.services.mozilla.com/D324882
---
 widget/gtk/DMABufSurface.cpp | 12 +-----------
 widget/gtk/DMABufSurface.h   | 14 +++++++-------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/widget/gtk/DMABufSurface.cpp b/widget/gtk/DMABufSurface.cpp
index 14bd62ef51b7..9242c1770098 100644
--- a/widget/gtk/DMABufSurface.cpp
+++ b/widget/gtk/DMABufSurface.cpp
@@ -470,17 +470,7 @@ bool DMABufSurface::ReleaseDMABuf() {
 }
 
 DMABufSurface::DMABufSurface(SurfaceType aSurfaceType)
-    : mGbmBufferObject(),
-      mGbmBufferFlags(0),
-#ifdef MOZ_LOGGING
-      mMappedRegion(),
-      mMappedRegionStride(),
-#endif
-      mGlobalRefCountFd(0),
-      mUID(gNewSurfaceUID++),
-      mPID(0),
-      mCanRecycle(true),
-      mSurfaceLock("DMABufSurface") {
+    : mUID(gNewSurfaceUID++), mPID(0), mSurfaceLock("DMABufSurface") {
   MOZ_COUNT_CTOR(DMABufSurface);
 }
 
diff --git a/widget/gtk/DMABufSurface.h b/widget/gtk/DMABufSurface.h
index 5f72a8b35a31..8c2c0ac3e4b0 100644
--- a/widget/gtk/DMABufSurface.h
+++ b/widget/gtk/DMABufSurface.h
@@ -214,13 +214,13 @@ class DMABufSurface : public BufferSurface {
   int32_t mStrides[DMABUF_BUFFER_PLANES] = {};
   int32_t mOffsets[DMABUF_BUFFER_PLANES] = {};
 
-  struct gbm_bo* mGbmBufferObject[DMABUF_BUFFER_PLANES];
-  uint32_t mGbmBufferFlags;
+  struct gbm_bo* mGbmBufferObject[DMABUF_BUFFER_PLANES]{};
+  uint32_t mGbmBufferFlags = 0;
 
 #ifdef MOZ_LOGGING
-  void* mMappedRegion[DMABUF_BUFFER_PLANES];
-  void* mMappedRegionData[DMABUF_BUFFER_PLANES];
-  uint32_t mMappedRegionStride[DMABUF_BUFFER_PLANES];
+  void* mMappedRegion[DMABUF_BUFFER_PLANES]{};
+  void* mMappedRegionData[DMABUF_BUFFER_PLANES]{};
+  uint32_t mMappedRegionStride[DMABUF_BUFFER_PLANES]{};
 #endif
 
   RefPtr<mozilla::gfx::FileHandleWrapper> mSyncFd;
@@ -232,7 +232,7 @@ class DMABufSurface : public BufferSurface {
 
   // Global refcount tracks DMABuf usage by rendering process,
   // it's used for surface recycle.
-  int mGlobalRefCountFd;
+  int mGlobalRefCountFd = 0;
 
   // mUID/mPID is set when DMABuf is created and/or exported to different
   // process. Allows to identify surfaces created by different process.
@@ -243,7 +243,7 @@ class DMABufSurface : public BufferSurface {
   // If set to false we can't recycle this surfaces as we can't ensure
   // mUID/mPID consistency. Also mPID may be zero in this case.
   // Applies to copied DMABuf surfaces for instance.
-  bool mCanRecycle;
+  bool mCanRecycle = true;
 
   mozilla::Mutex mSurfaceLock MOZ_UNANNOTATED;
 };