| Index: Source/core/platform/graphics/FontCache.h
|
| diff --git a/Source/core/platform/graphics/FontCache.h b/Source/core/platform/graphics/FontCache.h
|
| index 1951019522ed2771dbde4fb9724ab08c8c9630b8..882b5eeb7b1039573497e05c80a64fda5d71e9f8 100644
|
| --- a/Source/core/platform/graphics/FontCache.h
|
| +++ b/Source/core/platform/graphics/FontCache.h
|
| @@ -39,13 +39,13 @@
|
| #include "wtf/text/WTFString.h"
|
| #include "wtf/unicode/Unicode.h"
|
|
|
| -#if OS(WINDOWS)
|
| +#if OS(WIN)
|
| #include <windows.h>
|
| #include <objidl.h>
|
| #include <mlang.h>
|
| #endif
|
|
|
| -#if OS(WINDOWS) && !ENABLE(GDI_FONTS_ON_WINDOWS)
|
| +#if OS(WIN) && !ENABLE(GDI_FONTS_ON_WINDOWS)
|
| #include "SkFontMgr.h"
|
| #endif
|
|
|
| @@ -97,7 +97,7 @@ public:
|
| size_t inactiveFontDataCount();
|
| void purgeInactiveFontData(int count = INT_MAX);
|
|
|
| -#if OS(WINDOWS)
|
| +#if OS(WIN)
|
| PassRefPtr<SimpleFontData> fontDataFromDescriptionAndLogFont(const FontDescription&, ShouldRetain, const LOGFONT&, wchar_t* outFontFamilyName);
|
| #endif
|
|
|
| @@ -143,7 +143,7 @@ private:
|
| // Don't purge if this count is > 0;
|
| int m_purgePreventCount;
|
|
|
| -#if OS(WINDOWS) && !ENABLE(GDI_FONTS_ON_WINDOWS)
|
| +#if OS(WIN) && !ENABLE(GDI_FONTS_ON_WINDOWS)
|
| OwnPtr<SkFontMgr> m_fontManager;
|
| #endif
|
|
|
|
|