X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=blobdiff_plain;f=Source%2FWebCore%2Fplatform%2Fgraphics%2Fmac%2FFontCustomPlatformData.cpp;h=b192684c0f7a6f64da1364b06f7025629777ef71;hp=cfddf363fde4eb39e16e252beb78ff65f068fcb5;hb=bbf31976bd4c7d6546e8f1f950722b8e38f53ce1;hpb=6a748c1f4cd689be4b7c8ab2db0aa89385b788ca diff --git a/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp b/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp index cfddf36..b192684 100644 --- a/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp +++ b/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp @@ -78,7 +78,7 @@ private: FontCustomPlatformData::~FontCustomPlatformData() { -#ifdef BUILDING_ON_LEOPARD +#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050 if (m_atsContainer) ATSFontDeactivate(m_atsContainer, NULL, kATSOptionFlagsDefault); #endif @@ -119,7 +119,7 @@ FontCustomPlatformData* createFontCustomPlatformData(SharedBuffer* buffer) RetainPtr cgFontRef; -#ifndef BUILDING_ON_LEOPARD +#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 RetainPtr bufferData(AdoptCF, buffer->createCFData()); RetainPtr dataProvider(AdoptCF, CGDataProviderCreateWithCFData(bufferData.get())); @@ -157,7 +157,7 @@ FontCustomPlatformData* createFontCustomPlatformData(SharedBuffer* buffer) ATSFontDeactivate(containerRef, NULL, kATSOptionFlagsDefault); return 0; } -#endif // !defined(BUILDING_ON_LEOPARD) +#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 FontCustomPlatformData* fontCustomPlatformData = new FontCustomPlatformData(containerRef, cgFontRef.leakRef()); #if USE(SKIA_ON_MAC_CHROMIUM)