diff --git a/gfx/gl/GLContextGLX.h b/gfx/gl/GLContextGLX.h
index 7e7ff109aca8..aa6dd3861ca6 100644
--- a/gfx/gl/GLContextGLX.h
+++ b/gfx/gl/GLContextGLX.h
@@ -11,8 +11,6 @@
 #include "GLXLibrary.h"
 #include "mozilla/X11Util.h"
 
-class gfxXlibSurface;
-
 namespace mozilla {
 namespace gl {
 
@@ -21,8 +19,7 @@ class GLContextGLX : public GLContext {
   MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(GLContextGLX, override)
   static already_AddRefed<GLContextGLX> CreateGLContext(
       const GLContextDesc&, std::shared_ptr<gfx::XlibDisplay> display,
-      GLXDrawable drawable, GLXFBConfig cfg, bool deleteDrawable,
-      gfxXlibSurface* pixmap);
+      GLXDrawable drawable, GLXFBConfig cfg, Drawable ownedPixmap = X11None);
 
   static bool FindVisual(Display* display, int screen, int* const out_visualId);
 
@@ -68,18 +65,20 @@ class GLContextGLX : public GLContext {
   friend class GLContextProviderGLX;
 
   GLContextGLX(const GLContextDesc&, std::shared_ptr<gfx::XlibDisplay> aDisplay,
-               GLXDrawable aDrawable, GLXContext aContext, bool aDeleteDrawable,
-               bool aDoubleBuffered, gfxXlibSurface* aPixmap);
+               GLXDrawable aDrawable, GLXContext aContext, bool aDoubleBuffered,
+               Drawable aOwnedPixmap = X11None);
 
   const GLXContext mContext;
   const std::shared_ptr<gfx::XlibDisplay> mDisplay;
   const GLXDrawable mDrawable;
-  const bool mDeleteDrawable;
+  // The X pixmap associated with the GLX pixmap. If this is provided, then this
+  // class assumes responsibility for freeing both. Otherwise, the user of this
+  // class is responsibility for freeing the drawables.
+  const Drawable mOwnedPixmap;
   const bool mDoubleBuffered;
 
   GLXLibrary* const mGLX;
 
-  const RefPtr<gfxXlibSurface> mPixmap;
   const bool mOwnsContext = true;
 };
 
diff --git a/gfx/gl/GLContextProviderGLX.cpp b/gfx/gl/GLContextProviderGLX.cpp
index 6c8e0346043d..a0ecac3751c3 100644
--- a/gfx/gl/GLContextProviderGLX.cpp
+++ b/gfx/gl/GLContextProviderGLX.cpp
@@ -32,7 +32,6 @@
 #include "nsDebug.h"
 #include "nsIWidget.h"
 #include "GLXLibrary.h"
-#include "gfxXlibSurface.h"
 #include "gfxContext.h"
 #include "gfxEnv.h"
 #include "gfxPlatform.h"
@@ -318,8 +317,7 @@ std::shared_ptr<XlibDisplay> GLXLibrary::GetDisplay() {
 
 already_AddRefed<GLContextGLX> GLContextGLX::CreateGLContext(
     const GLContextDesc& desc, std::shared_ptr<XlibDisplay> display,
-    GLXDrawable drawable, GLXFBConfig cfg, bool deleteDrawable,
-    gfxXlibSurface* pixmap) {
+    GLXDrawable drawable, GLXFBConfig cfg, Drawable ownedPixmap) {
   GLXLibrary& glx = sGLXLibrary;
 
   int isDoubleBuffered = 0;
@@ -347,9 +345,8 @@ already_AddRefed<GLContextGLX> GLContextGLX::CreateGLContext(
     const auto glxContext = glx.fCreateContextAttribs(
         *display, cfg, nullptr, X11True, terminated.data());
     if (!glxContext) return nullptr;
-    const RefPtr<GLContextGLX> ret =
-        new GLContextGLX(desc, display, drawable, glxContext, deleteDrawable,
-                         isDoubleBuffered, pixmap);
+    const RefPtr<GLContextGLX> ret = new GLContextGLX(
+        desc, display, drawable, glxContext, isDoubleBuffered, ownedPixmap);
 
     if (!ret->Init()) return nullptr;
 
@@ -444,8 +441,11 @@ GLContextGLX::~GLContextGLX() {
 
   mGLX->fDestroyContext(*mDisplay, mContext);
 
-  if (mDeleteDrawable) {
+  // If we own the enclosed X pixmap, then free it after we free the enclosing
+  // GLX pixmap.
+  if (mOwnedPixmap) {
     mGLX->fDestroyPixmap(*mDisplay, mDrawable);
+    XFreePixmap(*mDisplay, mOwnedPixmap);
   }
 }
 
@@ -549,16 +549,14 @@ bool GLContextGLX::RestoreDrawable() {
 GLContextGLX::GLContextGLX(const GLContextDesc& desc,
                            std::shared_ptr<XlibDisplay> aDisplay,
                            GLXDrawable aDrawable, GLXContext aContext,
-                           bool aDeleteDrawable, bool aDoubleBuffered,
-                           gfxXlibSurface* aPixmap)
+                           bool aDoubleBuffered, Drawable aOwnedPixmap)
     : GLContext(desc, nullptr),
       mContext(aContext),
       mDisplay(aDisplay),
       mDrawable(aDrawable),
-      mDeleteDrawable(aDeleteDrawable),
+      mOwnedPixmap(aOwnedPixmap),
       mDoubleBuffered(aDoubleBuffered),
-      mGLX(&sGLXLibrary),
-      mPixmap(aPixmap) {}
+      mGLX(&sGLXLibrary) {}
 
 static bool AreCompatibleVisuals(Visual* one, Visual* two) {
   if (one->c_class != two->c_class) {
@@ -618,9 +616,8 @@ already_AddRefed<GLContext> CreateForWidget(Display* aXDisplay, Window aXWindow,
   } else {
     flags = CreateContextFlags::REQUIRE_COMPAT_PROFILE;
   }
-  return GLContextGLX::CreateGLContext({{flags}, false},
-                                       XlibDisplay::Borrow(aXDisplay), aXWindow,
-                                       config, false, nullptr);
+  return GLContextGLX::CreateGLContext(
+      {{flags}, false}, XlibDisplay::Borrow(aXDisplay), aXWindow, config);
 }
 
 already_AddRefed<GLContext> GLContextProviderGLX::CreateForCompositorWidget(
@@ -865,30 +862,27 @@ static already_AddRefed<GLContextGLX> CreateOffscreenPixmapContext(
   int depth;
   FindVisualAndDepth(*display, visid, &visual, &depth);
 
-  bool error = false;
-
   gfx::IntSize dummySize(16, 16);
-  RefPtr<gfxXlibSurface> surface = gfxXlibSurface::Create(
-      display, DefaultScreenOfDisplay(display->get()), visual, dummySize);
-  if (surface->CairoStatus() != 0) {
+  const auto drawable =
+      XCreatePixmap(*display, DefaultRootWindow(display->get()),
+                    dummySize.width, dummySize.height, depth);
+  if (!drawable) {
     return nullptr;
   }
 
   // Handle slightly different signature between glXCreatePixmap and
   // its pre-GLX-1.3 extension equivalent (though given the ABI, we
   // might not need to).
-  const auto drawable = surface->XDrawable();
   const auto pixmap = glx->fCreatePixmap(*display, config, drawable, nullptr);
   if (pixmap == 0) {
-    error = true;
+    XFreePixmap(*display, drawable);
+    return nullptr;
   }
 
-  if (error) return nullptr;
-
   auto fullDesc = GLContextDesc{desc};
   fullDesc.isOffscreen = true;
-  return GLContextGLX::CreateGLContext(fullDesc, display, pixmap, config, true,
-                                       surface);
+  return GLContextGLX::CreateGLContext(fullDesc, display, pixmap, config,
+                                       drawable);
 }
 
 /*static*/
diff --git a/gfx/thebes/gfxPlatformGtk.cpp b/gfx/thebes/gfxPlatformGtk.cpp
index d9d718c081b0..84d68b7ec0b5 100644
--- a/gfx/thebes/gfxPlatformGtk.cpp
+++ b/gfx/thebes/gfxPlatformGtk.cpp
@@ -707,7 +707,7 @@ class GtkVsyncSource final : public VsyncSource {
     }
 
     mGLContext = gl::GLContextGLX::CreateGLContext(
-        {}, gfx::XlibDisplay::Borrow(mXDisplay), root, config, false, nullptr);
+        {}, gfx::XlibDisplay::Borrow(mXDisplay), root, config);
 
     if (!mGLContext) {
       lock.NotifyAll();