From 76944b6f7b6e82abb1fd791f6c2583e1f1b4996d Mon Sep 17 00:00:00 2001
From: Marco Castelluccio <mar.castelluccio@studenti.unina.it>
Date: Wed, 30 May 2012 14:56:56 -0400
Subject: [PATCH] Bug 703484 - Part 3: Fix android OMTC whitelist. r=ajuma

--HG--
extra : rebase_source : e16788c85616fa92bfe724266b60435b446e9124
---
 widget/android/GfxInfo.cpp  | 13 ++++++++-----
 widget/android/nsWindow.cpp |  4 +++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/widget/android/GfxInfo.cpp b/widget/android/GfxInfo.cpp
index 09797385e937..7d760e0824b7 100644
--- a/widget/android/GfxInfo.cpp
+++ b/widget/android/GfxInfo.cpp
@@ -255,14 +255,17 @@ GfxInfo::GetGfxDriverInfo()
     /* The following entry, when uncommented, will allow us to whitelist a
      * specific device. See the long comment in GetFeatureStatusImpl for more
      * info. */
- // APPEND_TO_DRIVER_BLOCKLIST( DRIVER_OS_ALL,
- //   my_vendor_id, my_device_id,
- //   nsIGfxInfo::FEATURE_OPENGL_LAYERS, nsIGfxInfo::FEATURE_NO_INFO,
- //   DRIVER_LESS_THAN, GfxDriverInfo::allDevices );
+#ifdef MOZ_JAVA_COMPOSITOR
+    APPEND_TO_DRIVER_BLOCKLIST2( DRIVER_OS_ALL,
+      (nsAString&) GfxDriverInfo::GetDeviceVendor(VendorAll), GfxDriverInfo::allDevices,
+      nsIGfxInfo::FEATURE_OPENGL_LAYERS, nsIGfxInfo::FEATURE_NO_INFO,
+      DRIVER_COMPARISON_IGNORED, GfxDriverInfo::allDriverVersions );
+#else
     APPEND_TO_DRIVER_BLOCKLIST2( DRIVER_OS_ALL,
       (nsAString&) GfxDriverInfo::GetDeviceVendor(VendorAll), GfxDriverInfo::allDevices,
       nsIGfxInfo::FEATURE_OPENGL_LAYERS, nsIGfxInfo::FEATURE_BLOCKED_DEVICE,
       DRIVER_LESS_THAN, GfxDriverInfo::allDriverVersions );
+#endif
   }
   return *mDriverInfo;
 }
@@ -281,7 +284,7 @@ GfxInfo::GetFeatureStatusImpl(PRInt32 aFeature,
   if (aOS)
     *aOS = os;
 
-  // Don't evaluate special cases when evaluating the downlaoded blocklist.
+  // Don't evaluate special cases when evaluating the downloaded blocklist.
   if (!aDriverInfo.Length()) {
     if (aFeature == FEATURE_OPENGL_LAYERS) {
       /* The following code is an old way to whitelist devices when we're ready.
diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
index 045b23942459..4796ae9b9845 100644
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -689,6 +689,9 @@ nsWindow::GetLayerManager(PLayersChild*, LayersBackend, LayerManagerPersistence,
         mLayerManager = CreateBasicLayerManager();
         return mLayerManager;
     }
+
+    mUseAcceleratedRendering = GetShouldAccelerate();
+
 #ifdef MOZ_JAVA_COMPOSITOR
     bool useCompositor = UseOffMainThreadCompositing();
 
@@ -703,7 +706,6 @@ nsWindow::GetLayerManager(PLayersChild*, LayersBackend, LayerManagerPersistence,
         sFailedToCreateGLContext = true;
     }
 #endif
-    mUseAcceleratedRendering = GetShouldAccelerate();
 
     if (!mUseAcceleratedRendering ||
         sFailedToCreateGLContext)