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 cba5debca22aca4f0f88ad8c12ce825e70df82a5..6cb10a6d20751aed65af9b5997fed70221d94afb 100644 |
--- a/Source/core/platform/graphics/skia/FontCacheSkia.cpp |
+++ b/Source/core/platform/graphics/skia/FontCacheSkia.cpp |
@@ -29,7 +29,8 @@ |
*/ |
#include "config.h" |
-#include <unicode/locid.h> |
+ |
+#include "SkFontMgr.h" |
#include "SkTypeface.h" |
#include "core/platform/NotImplemented.h" |
#include "core/platform/graphics/Font.h" |
@@ -39,6 +40,7 @@ |
#include "wtf/Assertions.h" |
#include "wtf/text/AtomicString.h" |
#include "wtf/text/CString.h" |
+#include <unicode/locid.h> |
namespace WebCore { |
@@ -146,6 +148,12 @@ SkTypeface* FontCache::createTypeface(const FontDescription& fontDescription, co |
if (fontDescription.italic()) |
style |= SkTypeface::kItalic; |
+ // FIXME: Use SkFontStyle and matchFamilyStyle instead of legacyCreateTypeface. |
+#if OS(WINDOWS) && !ENABLE(GDI_FONTS_ON_WINDOWS) |
+ if (m_fontManager) |
+ return m_fontManager->legacyCreateTypeface(name.data(), style); |
+#endif |
+ |
return SkTypeface::CreateFromName(name.data(), static_cast<SkTypeface::Style>(style)); |
} |