wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/thebes/gfxPlatformMac.cpp
View File

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

10
toolkit/xre/nsNativeAppSupportCocoa.mm
View File

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