Bug 793923 - Fixed gfxPlatform to use gfx.content.azure.backends properly. r=ncameron,roc

--HG--
extra : rebase_source : 2aecac9b17cb570a87ad34bb7680847db7a8f457
This commit is contained in:
Anthony Jones 2012-10-09 11:45:35 +02:00
Родитель a32fd6eb31
Коммит a0fe5018ee
1 изменённых файлов: 6 добавлений и 12 удалений

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

@ -76,7 +76,6 @@ using namespace mozilla::layers;
gfxPlatform *gPlatform = nullptr;
static bool gEverInitialized = false;
static nsTArray<nsCString>* gBackendList = nullptr;
// These two may point to the same profile
static qcms_profile *gCMSOutputProfile = nullptr;
@ -411,9 +410,6 @@ gfxPlatform::Shutdown()
CompositorParent::ShutDown();
delete gBackendList;
gBackendList = nullptr;
delete gPlatform;
gPlatform = nullptr;
}
@ -1230,16 +1226,14 @@ gfxPlatform::GetBackendPref(const char* aEnabledPrefName, const char* aBackendPr
return BACKEND_NONE;
}
if (!gBackendList) {
gBackendList = new nsTArray<nsCString>();
nsCString prefString;
if (NS_SUCCEEDED(Preferences::GetCString(aBackendPrefName, &prefString))) {
ParseString(prefString, ',', *gBackendList);
}
nsTArray<nsCString> backendList;
nsCString prefString;
if (NS_SUCCEEDED(Preferences::GetCString(aBackendPrefName, &prefString))) {
ParseString(prefString, ',', backendList);
}
for (uint32_t i = 0; i < gBackendList->Length(); ++i) {
BackendType result = BackendTypeForName((*gBackendList)[i]);
for (uint32_t i = 0; i < backendList.Length(); ++i) {
BackendType result = BackendTypeForName(backendList[i]);
if ((1 << result) & aBackendBitmask) {
return result;
}