Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Bug 769721 - Minimal patch to force OOPP mode on for Windows Vista+ u…

…sers, because Flash is not tested with the IPP configuration and has known bugs, r=josh a=akeybl
  • Loading branch information...
commit d7e0a413f03a81d0acc310ebdd0553e4d295c5f1 1 parent ad19684
@bsmedberg bsmedberg authored
Showing with 22 additions and 0 deletions.
  1. +22 −0 dom/plugins/base/nsNPAPIPlugin.cpp
View
22 dom/plugins/base/nsNPAPIPlugin.cpp
@@ -312,6 +312,20 @@ static bool GMA9XXGraphics()
}
#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
nsNPAPIPlugin::RunPluginOOP(const nsPluginTag *aPluginTag)
{
@@ -323,6 +337,14 @@ nsNPAPIPlugin::RunPluginOOP(const nsPluginTag *aPluginTag)
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__)
// Only allow on Mac OS X 10.6 or higher.
if (OSXVersion() < 0x00001060) {
Please sign in to comment.
Something went wrong with that request. Please try again.