Bug 1422966 - Update mDisplay attribute initialization at nsWaylandDisplay::nsWaylandDisplay(), r=jhorak
authorMartin Stransky <stransky@redhat.com>
Mon, 04 Dec 2017 22:31:23 +0100
changeset 448296 8870736e152c95d897e691581f1d239f06729d82
parent 448295 3cf5876e6d1c63b17cc656e04468627671de7fe7
child 448297 9e720457902784c5584c9c2872772f8d412ea55a
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
bugs1422966
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 1422966 - Update mDisplay attribute initialization at nsWaylandDisplay::nsWaylandDisplay(), r=jhorak MozReview-Commit-ID: GQrCtvKDjfF
widget/gtk/WindowSurfaceWayland.cpp
--- a/widget/gtk/WindowSurfaceWayland.cpp
+++ b/widget/gtk/WindowSurfaceWayland.cpp
@@ -287,22 +287,21 @@ nsWaylandDisplay::Matches(wl_display *aD
 {
   return mThreadId == PR_GetCurrentThread() && aDisplay == mDisplay;
 }
 
 NS_IMPL_ISUPPORTS(nsWaylandDisplay, nsISupports);
 
 nsWaylandDisplay::nsWaylandDisplay(wl_display *aDisplay)
   : mThreadId(PR_GetCurrentThread())
-  , mDisplay(aDisplay)
-  , mDisplay(aDisplay)
   // gfx::SurfaceFormat::B8G8R8A8 is a basic Wayland format
   // and is always present.
   , mFormat(gfx::SurfaceFormat::B8G8R8A8)
   , mShm(nullptr)
+  , mDisplay(aDisplay)
 {
   if (NS_IsMainThread()) {
     // Use default event queue in main thread operated by Gtk+.
     mEventQueue = nullptr;
   } else {
     mEventQueue = wl_display_create_queue(mDisplay);
     MessageLoop::current()->PostTask(NewRunnableFunction(&WaylandDisplayLoop,
                                                          mDisplay));