Backed out changeset 71f770d93407 (bug 1772721) for causing build bustage on /builds/worker/checkouts/gecko/widget/gtk/nsWindow.cpp CLOSED TREE

widget/gtk/mozgtk/moz.build

@@ -11,7 +11,6 @@ SOURCES += [
 ]
 
 CFLAGS += CONFIG["MOZ_X11_CFLAGS"]
-CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
 
 # If LDFLAGS contains -Wl,--as-needed or if it's the default for the toolchain,
 # we need to add -Wl,--no-as-needed before the gtk libraries, otherwise the

widget/gtk/mozgtk/mozgtk.c

@@ -6,13 +6,6 @@
 
 #include "mozilla/Types.h"
 
-#include <gdk/gdk.h>
-
-// Dummy call to gtk3 library to prevent the linker from removing
-// the gtk3 dependency with --as-needed.
-// see toolkit/library/moz.build for details.
-MOZ_EXPORT void mozgtk_linker_holder() { gdk_display_get_default(); }
-
 #ifdef MOZ_X11
 #  include <X11/Xlib.h>
 // Bug 1271100

widget/gtk/nsWindow.cpp

@@ -268,9 +268,6 @@ static SystemTimeConverter<guint32>& TimeConverter() {
 
 bool nsWindow::sTransparentMainWindow = false;
 
-// forward declare from mozgtk
-MOZ_EXPORT extern "C" void mozgtk_linker_holder();
-
 namespace mozilla {
 
 #ifdef MOZ_X11
@@ -431,10 +428,6 @@ nsWindow::nsWindow()
     }
 #endif
   }
-  // Dummy call to mozgtk to prevent the linker from removing
-  // the dependency with --as-needed.
-  // see toolkit/library/moz.build for details.
-  mozgtk_linker_holder();
 }
 
 nsWindow::~nsWindow() {
@@ -5341,6 +5334,10 @@ void nsWindow::ConfigureGdkWindow() {
     // tearing because Gecko does not align its framebuffer updates with
     // vblank.
     SetCompositorHint(GTK_WIDGET_COMPOSIDED_ENABLED);
+
+    // Dummy call to a function in mozgtk to prevent the linker from removing
+    // the dependency with --as-needed.
+    XShmQueryExtension(DefaultXDisplay());
   }
 #endif
 #ifdef MOZ_WAYLAND