Bug 696636 - move GetData to the beginning so it's always called first - r=mattwoodrow

This commit is contained in:
Benoit Jacob 2012-03-07 15:18:57 -05:00
Родитель 69cc11fdf5
Коммит 56c7ad1c4a
1 изменённых файлов: 2 добавлений и 1 удалений

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

@ -283,6 +283,8 @@ GfxInfo::GetFeatureStatusImpl(PRInt32 aFeature,
OperatingSystem* aOS /* = nsnull */) OperatingSystem* aOS /* = nsnull */)
{ {
GetData();
NS_ENSURE_ARG_POINTER(aStatus); NS_ENSURE_ARG_POINTER(aStatus);
*aStatus = nsIGfxInfo::FEATURE_STATUS_UNKNOWN; *aStatus = nsIGfxInfo::FEATURE_STATUS_UNKNOWN;
aSuggestedDriverVersion.SetIsVoid(true); aSuggestedDriverVersion.SetIsVoid(true);
@ -310,7 +312,6 @@ GfxInfo::GetFeatureStatusImpl(PRInt32 aFeature,
if (aFeature == nsIGfxInfo::FEATURE_OPENGL_LAYERS || if (aFeature == nsIGfxInfo::FEATURE_OPENGL_LAYERS ||
aFeature == nsIGfxInfo::FEATURE_WEBGL_OPENGL || aFeature == nsIGfxInfo::FEATURE_WEBGL_OPENGL ||
aFeature == nsIGfxInfo::FEATURE_WEBGL_MSAA) { aFeature == nsIGfxInfo::FEATURE_WEBGL_MSAA) {
GetData();
// Disable OpenGL layers when we don't have texture_from_pixmap because it regresses performance. // Disable OpenGL layers when we don't have texture_from_pixmap because it regresses performance.
if (aFeature == nsIGfxInfo::FEATURE_OPENGL_LAYERS && !mHasTextureFromPixmap) { if (aFeature == nsIGfxInfo::FEATURE_OPENGL_LAYERS && !mHasTextureFromPixmap) {