| Index: Source/core/platform/graphics/skia/FontCacheSkia.cpp
|
| diff --git a/Source/core/platform/graphics/skia/FontCacheSkia.cpp b/Source/core/platform/graphics/skia/FontCacheSkia.cpp
|
| index 6cb10a6d20751aed65af9b5997fed70221d94afb..da1cc8eca18939cfc98f6794d704e829dcaf9b7a 100644
|
| --- a/Source/core/platform/graphics/skia/FontCacheSkia.cpp
|
| +++ b/Source/core/platform/graphics/skia/FontCacheSkia.cpp
|
| @@ -48,7 +48,7 @@ void FontCache::platformInit()
|
| {
|
| }
|
|
|
| -#if !OS(WINDOWS)
|
| +#if !OS(WIN)
|
| PassRefPtr<SimpleFontData> FontCache::getFontDataForCharacter(const Font& font, UChar32 c)
|
| {
|
| icu::Locale locale = icu::Locale::getDefault();
|
| @@ -149,7 +149,7 @@ SkTypeface* FontCache::createTypeface(const FontDescription& fontDescription, co
|
| style |= SkTypeface::kItalic;
|
|
|
| // FIXME: Use SkFontStyle and matchFamilyStyle instead of legacyCreateTypeface.
|
| -#if OS(WINDOWS) && !ENABLE(GDI_FONTS_ON_WINDOWS)
|
| +#if OS(WIN) && !ENABLE(GDI_FONTS_ON_WINDOWS)
|
| if (m_fontManager)
|
| return m_fontManager->legacyCreateTypeface(name.data(), style);
|
| #endif
|
| @@ -157,7 +157,7 @@ SkTypeface* FontCache::createTypeface(const FontDescription& fontDescription, co
|
| return SkTypeface::CreateFromName(name.data(), static_cast<SkTypeface::Style>(style));
|
| }
|
|
|
| -#if !OS(WINDOWS)
|
| +#if !OS(WIN)
|
| FontPlatformData* FontCache::createFontPlatformData(const FontDescription& fontDescription, const AtomicString& family)
|
| {
|
| CString name;
|
|
|