Bug 634814: Further limit Flash OOP logic (all of it) to i386 on Mac OS X. There is no case in which we'd want to hard-code running Flash in-process in a 64-bit browser. r=benwa a=josh

modules/plugin/base/src/nsNPAPIPlugin.cpp

@@ -277,7 +277,7 @@ nsNPAPIPlugin::PluginCrashed(const nsAString& pluginDumpID,
 
 #ifdef MOZ_IPC
 
-#ifdef XP_MACOSX
+#if defined(XP_MACOSX) && defined(__i386__)
 static PRInt32 OSXVersion()
 {
   static PRInt32 gOSXVersion = 0x0;
@@ -292,7 +292,6 @@ 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
@@ -317,7 +316,6 @@ static PRBool GMA9XXGraphics()
   return hasIntelGMA9XX;
 }
 #endif
-#endif
 
 PRBool
 nsNPAPIPlugin::RunPluginOOP(const nsPluginTag *aPluginTag)
@@ -330,7 +328,7 @@ nsNPAPIPlugin::RunPluginOOP(const nsPluginTag *aPluginTag)
     return PR_FALSE;
   }
 
-#ifdef XP_MACOSX
+#if defined(XP_MACOSX) && defined(__i386__)
   // Only allow on Mac OS X 10.6 or higher.
   if (OSXVersion() < 0x00001060) {
     return PR_FALSE;
@@ -352,13 +350,11 @@ nsNPAPIPlugin::RunPluginOOP(const nsPluginTag *aPluginTag)
       }
     }
 
-#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