diff --git a/dom/canvas/WebGLVertexArrayGL.cpp b/dom/canvas/WebGLVertexArrayGL.cpp
index e88c2a4b911a..2ba38330ecdf 100644
--- a/dom/canvas/WebGLVertexArrayGL.cpp
+++ b/dom/canvas/WebGLVertexArrayGL.cpp
@@ -12,9 +12,7 @@ namespace mozilla {
 
 WebGLVertexArrayGL::WebGLVertexArrayGL(WebGLContext* webgl)
     : WebGLVertexArray(webgl)
-#if defined(XP_LINUX)
     , mIsVAO(false)
-#endif
 { }
 
 WebGLVertexArrayGL::~WebGLVertexArrayGL()
@@ -30,9 +28,7 @@ WebGLVertexArrayGL::DeleteImpl()
     mContext->MakeContextCurrent();
     mContext->gl->fDeleteVertexArrays(1, &mGLName);
 
-#if defined(XP_LINUX)
     mIsVAO = false;
-#endif
 }
 
 void
@@ -41,9 +37,7 @@ WebGLVertexArrayGL::BindVertexArrayImpl()
     mContext->mBoundVertexArray = this;
     mContext->gl->fBindVertexArray(mGLName);
 
-#if defined(XP_LINUX)
     mIsVAO = true;
-#endif
 }
 
 void
@@ -55,15 +49,11 @@ WebGLVertexArrayGL::GenVertexArray()
 bool
 WebGLVertexArrayGL::IsVertexArrayImpl()
 {
-#if defined(XP_LINUX)
     gl::GLContext* gl = mContext->gl;
-    if (gl->WorkAroundDriverBugs() &&
-        gl->Vendor() == gl::GLVendor::VMware &&
-        gl->Renderer() == gl::GLRenderer::GalliumLlvmpipe)
+    if (gl->WorkAroundDriverBugs())
     {
         return mIsVAO;
     }
-#endif
 
     mContext->MakeContextCurrent();
     return mContext->gl->fIsVertexArray(mGLName) != 0;
diff --git a/dom/canvas/WebGLVertexArrayGL.h b/dom/canvas/WebGLVertexArrayGL.h
index 4923804347c2..c64291033e35 100644
--- a/dom/canvas/WebGLVertexArrayGL.h
+++ b/dom/canvas/WebGLVertexArrayGL.h
@@ -25,13 +25,11 @@ protected:
     explicit WebGLVertexArrayGL(WebGLContext* webgl);
     ~WebGLVertexArrayGL();
 
-#if defined(XP_LINUX)
     // Bug 1140459: Some drivers (including our test slaves!) don't
-    // give reasonable answers for IsRenderbuffer, maybe others.
+    // give reasonable answers for IsVertexArray, maybe others.
     //
     // So we track the `is a VAO` state ourselves.
     bool mIsVAO;
-#endif
 };
 
 } // namespace mozilla