Bug 850408 - Part 1: Remove Snow Leopard OS checks in gfx and xre. r=joshmoz

This commit is contained in:
Chris Peterson 2013-03-07 23:00:07 +00:00
parent 5c0178fee7
commit b805c917dd
2 changed files with 5 additions and 10 deletions

View File

@ -66,9 +66,8 @@ gfxPlatformMac::gfxPlatformMac()
{
mOSXVersion = 0;
OSXVersion();
if (mOSXVersion >= MAC_OS_X_VERSION_10_6_HEX) {
DisableFontActivation();
}
DisableFontActivation();
mFontAntiAliasingThreshold = ReadAntiAliasingThreshold();
uint32_t canvasMask = (1 << BACKEND_CAIRO) | (1 << BACKEND_SKIA) | (1 << BACKEND_COREGRAPHICS);

View File

@ -67,7 +67,6 @@ public:
private:
bool mCanShowUI;
};
NS_IMETHODIMP
@ -77,6 +76,8 @@ nsNativeAppSupportCocoa::Enable()
return NS_OK;
}
#define MAC_OS_X_VERSION_10_6_HEX 0x00001060
NS_IMETHODIMP nsNativeAppSupportCocoa::Start(bool *_retval)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
@ -90,12 +91,7 @@ NS_IMETHODIMP nsNativeAppSupportCocoa::Start(bool *_retval)
// alert here. But the alert's message and buttons would require custom
// localization. So (for now at least) we just log an English message
// to the console before quitting.
#ifdef __LP64__
SInt32 minimumOS = 0x00001060;
#else
SInt32 minimumOS = 0x00001050;
#endif
if ((err != noErr) || response < minimumOS) {
if ((err != noErr) || response < MAC_OS_X_VERSION_10_6_HEX) {
NSLog(@"Minimum OS version requirement not met!");
return NS_OK;
}