Bug 610526: Fix bug that caused Flash to not load on machines with GMA9xx GPUs. r=bsmedberg a=blocking2.0final+

This commit is contained in:
Josh Aas 2011-02-15 15:15:08 -05:00
parent a718b751ed
commit cffb031850

View File

@ -288,6 +288,7 @@ static PRInt32 OSXVersion()
return gOSXVersion;
}
#if defined(__i386__)
// Detects machines with Intel GMA9xx GPUs.
// kCGLRendererIDMatchingMask and kCGLRendererIntel900ID are only defined in the 10.6 SDK.
#define CGLRendererIDMatchingMask 0x00FE7F00
@ -312,6 +313,7 @@ static PRBool GMA9XXGraphics()
return hasIntelGMA9XX;
}
#endif
#endif
PRBool
nsNPAPIPlugin::RunPluginOOP(const nsPluginTag *aPluginTag)
@ -345,11 +347,14 @@ nsNPAPIPlugin::RunPluginOOP(const nsPluginTag *aPluginTag)
return PR_FALSE;
}
}
#if defined(__i386__)
// At this point we have Flash 10.1+ but now we also need to blacklist
// if the machine has a Intel GMA9XX GPU.
if (GMA9XXGraphics()) {
return PR_FALSE;
}
#endif
}
#endif