--- a/gfx/gl/GLContextGLX.h
+++ b/gfx/gl/GLContextGLX.h
@@ -23,16 +23,20 @@ public:
                     const SurfaceCaps& caps,
                     bool isOffscreen,
                     Display* display,
                     GLXDrawable drawable,
                     GLXFBConfig cfg,
                     bool deleteDrawable,
                     gfxXlibSurface* pixmap);
 
+    static bool
+    FindVisual(Display* display, int screen, bool useWebRender,
+               bool useAlpha, int* const out_visualId);
+
     // Finds a GLXFBConfig compatible with the provided window.
     static bool
     FindFBConfigForWindow(Display* display, int screen, Window window,
                           ScopedXFree<GLXFBConfig>* const out_scopedConfigArr,
                           GLXFBConfig* const out_config, int* const out_visid,
                           bool aWebRender);
 
     ~GLContextGLX();

--- a/gfx/gl/GLContextProviderGLX.cpp
+++ b/gfx/gl/GLContextProviderGLX.cpp
@@ -880,16 +880,44 @@ ChooseConfig(GLXLibrary* glx, Display* d
         *out_visid = visid;
         return true;
     }
 
     return false;
 }
 
 bool
+GLContextGLX::FindVisual(Display* display, int screen, bool useWebRender,
+                         bool useAlpha, int* const out_visualId)
+{
+    int attribs[] = {
+        LOCAL_GLX_RGBA,
+        LOCAL_GLX_DOUBLEBUFFER,
+        LOCAL_GLX_RED_SIZE, 8,
+        LOCAL_GLX_GREEN_SIZE, 8,
+        LOCAL_GLX_BLUE_SIZE, 8,
+        LOCAL_GLX_ALPHA_SIZE, useAlpha ? 8 : 0,
+        LOCAL_GLX_DEPTH_SIZE, useWebRender ? 24 : 0,
+        LOCAL_GL_NONE
+    };
+
+    if (!sGLXLibrary.EnsureInitialized()) {
+        return false;
+    }
+
+    XVisualInfo* visuals = sGLXLibrary.fChooseVisual(display, screen, attribs);
+    if (!visuals) {
+        return false;
+    }
+
+    *out_visualId = visuals[0].visualid;
+    return true;
+}
+
+bool
 GLContextGLX::FindFBConfigForWindow(Display* display, int screen, Window window,
                                     ScopedXFree<GLXFBConfig>* const out_scopedConfigArr,
                                     GLXFBConfig* const out_config, int* const out_visid,
                                     bool aWebRender)
 {
     ScopedXFree<GLXFBConfig>& cfgs = *out_scopedConfigArr;
     int numConfigs;
     const int webrenderAttribs[] = {