| Index: Source/core/platform/graphics/FontCustomPlatformData.h
|
| diff --git a/Source/core/platform/graphics/FontCustomPlatformData.h b/Source/core/platform/graphics/FontCustomPlatformData.h
|
| index e7a2239b471760145ddf6f33b7bc6515b7247843..24d8b96d16d50c1ec83279096dc5da2bd41491ec 100644
|
| --- a/Source/core/platform/graphics/FontCustomPlatformData.h
|
| +++ b/Source/core/platform/graphics/FontCustomPlatformData.h
|
| @@ -42,13 +42,13 @@
|
| #include <windows.h>
|
| #endif
|
|
|
| -#if OS(DARWIN)
|
| +#if OS(MACOSX)
|
| #include "wtf/RetainPtr.h"
|
| #include <CoreFoundation/CFBase.h>
|
| typedef struct CGFont* CGFontRef;
|
| #endif
|
|
|
| -#if OS(DARWIN) || OS(UNIX) || (OS(WINDOWS) && !ENABLE(GDI_FONTS_ON_WINDOWS))
|
| +#if OS(MACOSX) || OS(UNIX) || (OS(WINDOWS) && !ENABLE(GDI_FONTS_ON_WINDOWS))
|
| #include "wtf/RefPtr.h"
|
| class SkTypeface;
|
| #endif
|
| @@ -73,7 +73,7 @@ private:
|
| FontCustomPlatformData(HANDLE fontReference, const String& name);
|
| HANDLE m_fontReference;
|
| String m_name;
|
| -#elif OS(DARWIN)
|
| +#elif OS(MACOSX)
|
| explicit FontCustomPlatformData(CGFontRef, PassRefPtr<SkTypeface>);
|
| RetainPtr<CGFontRef> m_cgFont;
|
| RefPtr<SkTypeface> m_typeface;
|
|
|