Bug 711564 - Disable ICA/CA Plug-in drawing model on 10.5 because of instability. r=smichaud

--HG--
extra : rebase_source : e204fd8058110d7fbefec1160013185dffc08132

dom/plugins/base/nsNPAPIPlugin.cpp

@@ -92,6 +92,7 @@
 #include <Carbon/Carbon.h>
 #include <ApplicationServices/ApplicationServices.h>
 #include <OpenGL/OpenGL.h>
+#include "nsCocoaFeatures.h"
 #endif
 
 // needed for nppdf plugin
@@ -2257,13 +2258,13 @@ _getvalue(NPP npp, NPNVariable variable, void *result)
   }
 
    case NPNVsupportsCoreAnimationBool: {
-     *(NPBool*)result = true;
+     *(NPBool*)result = nsCocoaFeatures::SupportCoreAnimationPlugins();
 
      return NPERR_NO_ERROR;
    }
 
    case NPNVsupportsInvalidatingCoreAnimationBool: {
-     *(NPBool*)result = true;
+     *(NPBool*)result = nsCocoaFeatures::SupportCoreAnimationPlugins();
 
      return NPERR_NO_ERROR;
    }

dom/plugins/ipc/PluginInstanceChild.cpp

@@ -118,6 +118,7 @@ static const TCHAR kPluginIgnoreSubclassProperty[] = TEXT("PluginIgnoreSubclassP
 
 #elif defined(XP_MACOSX)
 #include <ApplicationServices/ApplicationServices.h>
+#include "nsCocoaFeatures.h"
 #include "PluginUtilsOSX.h"
 #endif // defined(XP_MACOSX)
 
@@ -420,12 +421,12 @@ PluginInstanceChild::NPN_GetValue(NPNVariable aVar,
     }
 
     case NPNVsupportsCoreAnimationBool: {
-        *((NPBool*)aValue) = true;
+        *((NPBool*)aValue) = nsCocoaFeatures::SupportCoreAnimationPlugins();
         return NPERR_NO_ERROR;
     }
 
     case NPNVsupportsInvalidatingCoreAnimationBool: {
-        *((NPBool*)aValue) = true;
+        *((NPBool*)aValue) = nsCocoaFeatures::SupportCoreAnimationPlugins();
         return NPERR_NO_ERROR;
     }
 

widget/cocoa/nsCocoaFeatures.h

@@ -45,8 +45,10 @@ class nsCocoaFeatures {
 public:
   static PRInt32 OSXVersion();
 
-  static bool OnSnowLeopardOrLater();  
-  static bool OnLionOrLater();  
+  static bool OnSnowLeopardOrLater();
+  static bool OnLionOrLater();
+
+  static bool SupportCoreAnimationPlugins();
 private:
   static PRInt32 mOSXVersion;
 };

widget/cocoa/nsCocoaFeatures.mm

@@ -67,6 +67,14 @@ nsCocoaFeatures::OSXVersion()
     return mOSXVersion;
 }
 
+/* static */ bool
+nsCocoaFeatures::SupportCoreAnimationPlugins()
+{
+    // Disallow Core Animation on 10.5 because of crashes.
+    // See Bug 711564.
+    return (OSXVersion() >= MAC_OS_X_VERSION_10_6_HEX);
+}
+
 /* static */ bool
 nsCocoaFeatures::OnSnowLeopardOrLater()
 {