Bug 769721 - Minimal patch to force OOPP mode on for Windows Vista+ users, because Flash is not tested with the IPP configuration and has known bugs, r=josh

This commit is contained in:
Benjamin Smedberg 2012-07-03 17:04:45 -04:00
parent b7f0b6aeae
commit 8ca81817e1

View File

@ -281,6 +281,20 @@ static bool GMA9XXGraphics()
} }
#endif #endif
#ifdef XP_WIN
static bool
IsVistaOrLater()
{
OSVERSIONINFO info;
ZeroMemory(&info, sizeof(OSVERSIONINFO));
info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
GetVersionEx(&info);
return info.dwMajorVersion >= 6;
}
#endif
bool bool
nsNPAPIPlugin::RunPluginOOP(const nsPluginTag *aPluginTag) nsNPAPIPlugin::RunPluginOOP(const nsPluginTag *aPluginTag)
{ {
@ -292,6 +306,14 @@ nsNPAPIPlugin::RunPluginOOP(const nsPluginTag *aPluginTag)
return false; return false;
} }
#ifdef XP_WIN
// On Windows Vista+, we force Flash to run in OOPP mode because Adobe
// doesn't test Flash in-process and there are known stability bugs.
if (aPluginTag->mIsFlashPlugin && IsVistaOrLater()) {
return true;
}
#endif
#if defined(XP_MACOSX) && defined(__i386__) #if defined(XP_MACOSX) && defined(__i386__)
// Only allow on Mac OS X 10.6 or higher. // Only allow on Mac OS X 10.6 or higher.
if (OSXVersion() < 0x00001060) { if (OSXVersion() < 0x00001060) {