From 14949db0b2d6445cc6c5756957af01918b57353d Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Fri, 30 Aug 2013 14:30:10 -0700
Subject: [PATCH] Bug 910488 - XSync can hang indefinitely with OMTC enabled
 (r=bjacob)

---
 gfx/gl/GLContextProviderGLX.cpp        | 2 +-
 gfx/layers/ipc/ShadowLayerUtilsX11.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gfx/gl/GLContextProviderGLX.cpp b/gfx/gl/GLContextProviderGLX.cpp
index 2630299dd8a..08ce90928e8 100644
--- a/gfx/gl/GLContextProviderGLX.cpp
+++ b/gfx/gl/GLContextProviderGLX.cpp
@@ -937,7 +937,7 @@ TRY_AGAIN_NO_SHARING:
 
     bool TextureImageSupportsGetBackingSurface()
     {
-        return mGLX->UseTextureFromPixmap();
+        return false;
     }
 
     virtual already_AddRefed<TextureImage>
diff --git a/gfx/layers/ipc/ShadowLayerUtilsX11.cpp b/gfx/layers/ipc/ShadowLayerUtilsX11.cpp
index ad7df49154c..debedef9883 100644
--- a/gfx/layers/ipc/ShadowLayerUtilsX11.cpp
+++ b/gfx/layers/ipc/ShadowLayerUtilsX11.cpp
@@ -45,6 +45,9 @@ namespace layers {
 static bool
 UsingXCompositing()
 {
+  if (!PR_GetEnv("MOZ_LAYERS_ENABLE_XLIB_SURFACES")) {
+      return false;
+  }
   return (gfxASurface::SurfaceTypeXlib ==
           gfxPlatform::GetPlatform()->ScreenReferenceSurface()->GetType());
 }
@@ -117,9 +120,6 @@ ISurfaceAllocator::PlatformAllocSurfaceDescriptor(const gfxIntSize& aSize,
                                                   uint32_t aCaps,
                                                   SurfaceDescriptor* aBuffer)
 {
-  if (!PR_GetEnv("MOZ_LAYERS_ENABLE_XLIB_SURFACES")) {
-      return false;
-  }
   if (!UsingXCompositing()) {
     // If we're not using X compositing, we're probably compositing on
     // the client side, in which case X surfaces would just slow