Index: Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp |
diff --git a/Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp b/Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp |
index 521495c735d9cad00a54adc119bed37db26ce0e9..1cff78debf288c4a64bc70584bd9479043354f9d 100644 |
--- a/Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp |
+++ b/Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp |
@@ -298,6 +298,7 @@ FontPlatformData::~FontPlatformData() |
String FontPlatformData::fontFamilyName() const |
{ |
+#if ENABLE(GDI_FONTS_ON_WINDOWS) |
HWndDC dc(0); |
HGDIOBJ oldFont = static_cast<HFONT>(SelectObject(dc, hfont())); |
WCHAR name[LF_FACESIZE]; |
@@ -306,6 +307,14 @@ String FontPlatformData::fontFamilyName() const |
resultLength--; // ignore the null terminator |
SelectObject(dc, oldFont); |
return String(name, resultLength); |
+#else |
+ // FIXME: This returns the requested name, perhaps a better solution would be to |
+ // return the list of names provided by SkTypeface::createFamilyNameIterator. |
+ ASSERT(typeface()); |
+ SkString familyName; |
+ typeface()->getFamilyName(&familyName); |
+ return String::fromUTF8(familyName.c_str()); |
+#endif |
} |
bool FontPlatformData::isFixedPitch() const |