Bug 683296 - Change GL layers pref default on Android, but blacklist all devices. r=jrmuizel

This commit is contained in:
Ali Juma 2011-09-06 15:07:07 -04:00
Родитель 528949098b
Коммит 93038449d6
2 изменённых файлов: 12 добавлений и 7 удалений

Просмотреть файл

@ -573,6 +573,8 @@ pref("ui.dragThresholdY", 25);
#if MOZ_PLATFORM_MAEMO == 6
pref("layers.acceleration.disabled", false);
#elifdef ANDROID
pref("layers.acceleration.disabled", false);
#else
pref("layers.acceleration.disabled", true);
#endif

Просмотреть файл

@ -271,13 +271,16 @@ GfxInfo::GetFeatureStatusImpl(PRInt32 aFeature, PRInt32 *aStatus, nsAString & aS
}
if (aFeature == FEATURE_OPENGL_LAYERS) {
nsAutoString str;
/* Whitelist Galaxy S phones */
if (mozilla::AndroidBridge::Bridge()->GetStaticStringField("android/os/Build", "HARDWARE", str)) {
if (str != NS_LITERAL_STRING("smdkc110")) {
status = FEATURE_BLOCKED_DEVICE;
}
}
/* XXX: Use this code when we're ready to whitelist devices. */
// nsAutoString str;
// /* Whitelist Galaxy S phones */
// if (mozilla::AndroidBridge::Bridge()->GetStaticStringField("android/os/Build", "HARDWARE", str)) {
// if (str != NS_LITERAL_STRING("smdkc110")) {
// status = FEATURE_BLOCKED_DEVICE;
// }
// }
status = FEATURE_BLOCKED_DEVICE;
}
*aStatus = status;