diff options
Diffstat (limited to 'WebCore/platform/graphics/cairo/FontCacheCairo.cpp')
-rw-r--r-- | WebCore/platform/graphics/cairo/FontCacheCairo.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/WebCore/platform/graphics/cairo/FontCacheCairo.cpp b/WebCore/platform/graphics/cairo/FontCacheCairo.cpp index fceeea1..cb54549 100644 --- a/WebCore/platform/graphics/cairo/FontCacheCairo.cpp +++ b/WebCore/platform/graphics/cairo/FontCacheCairo.cpp @@ -88,7 +88,8 @@ static bool isWellKnownFontName(const AtomicString family) // Fonts that are used by layout tests included. The fact that // they are used in Layout Tests indicate web compatibility issues // if we do not handle them correctly. - if (equalIgnoringCase(family, "sans-serif") || equalIgnoringCase(family, "serif") + if (equalIgnoringCase(family, "sans-serif") || equalIgnoringCase(family, "sans") + || equalIgnoringCase(family, "serif") || equalIgnoringCase(family, "mono") || equalIgnoringCase(family, "monospace") || equalIgnoringCase(family, "cursive") || equalIgnoringCase(family, "fantasy") || equalIgnoringCase(family, "Times") || equalIgnoringCase(family, "Courier") || equalIgnoringCase(family, "Helvetica") @@ -118,9 +119,6 @@ FontPlatformData* FontCache::createFontPlatformData(const FontDescription& fontD if (!FcPatternAddString(pattern.get(), FC_FAMILY, reinterpret_cast<const FcChar8*>(fcfamily))) return 0; - FcConfigSubstitute(0, pattern.get(), FcMatchPattern); - FcDefaultSubstitute(pattern.get()); - GOwnPtr<FcObjectSet> objectSet(FcObjectSetCreate()); if (!FcObjectSetAdd(objectSet.get(), FC_FAMILY)) return 0; |