From beebee9b095ba58131932c7bec656fa41c5e5557 Mon Sep 17 00:00:00 2001
From: Nicholas Cameron <ncameron@mozilla.com>
Date: Wed, 27 Nov 2013 11:15:17 +1300
Subject: [PATCH] Bug 924403. Linux users who had previously opted in to OpenGL
 get OMTC OpenGL. r=mattwoodrow

---
 gfx/thebes/gfxPlatform.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
index a0ad3719a5d..db72c0e2a8f 100644
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -2108,7 +2108,13 @@ gfxPlatform::GetPrefLayersAccelerationForceEnabled()
 bool gfxPlatform::OffMainThreadCompositionRequired()
 {
   InitLayersAccelerationPrefs();
+#if defined(MOZ_WIDGET_GTK) && defined(NIGHTLY_BUILD)
+  // Linux users who chose OpenGL are being grandfathered in to OMTC
+  return sPrefBrowserTabsRemote ||
+         sPrefLayersAccelerationForceEnabled;
+#else
   return sPrefBrowserTabsRemote;
+#endif
 }
 
 bool