diff options
| author | Steve Block <steveblock@google.com> | 2010-02-15 12:23:52 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-16 11:48:32 +0000 |
| commit | 8a0914b749bbe7da7768e07a7db5c6d4bb09472b (patch) | |
| tree | 73f9065f370435d6fde32ae129d458a8c77c8dff /WebCore/platform/graphics/haiku/FontCacheHaiku.cpp | |
| parent | bf14be70295513b8076f3fa47a268a7e42b2c478 (diff) | |
| download | external_webkit-8a0914b749bbe7da7768e07a7db5c6d4bb09472b.zip external_webkit-8a0914b749bbe7da7768e07a7db5c6d4bb09472b.tar.gz external_webkit-8a0914b749bbe7da7768e07a7db5c6d4bb09472b.tar.bz2 | |
Merge webkit.org at r54731 : Initial merge by git
Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
Diffstat (limited to 'WebCore/platform/graphics/haiku/FontCacheHaiku.cpp')
| -rw-r--r-- | WebCore/platform/graphics/haiku/FontCacheHaiku.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/platform/graphics/haiku/FontCacheHaiku.cpp b/WebCore/platform/graphics/haiku/FontCacheHaiku.cpp index b99bf42..7ade370 100644 --- a/WebCore/platform/graphics/haiku/FontCacheHaiku.cpp +++ b/WebCore/platform/graphics/haiku/FontCacheHaiku.cpp @@ -51,18 +51,18 @@ const SimpleFontData* FontCache::getFontDataForCharacters(const Font& font, cons return getCachedFontData(&data); } -FontPlatformData* FontCache::getSimilarFontPlatformData(const Font& font) +SimpleFontData* FontCache::getSimilarFontPlatformData(const Font& font) { notImplemented(); return 0; } -FontPlatformData* FontCache::getLastResortFallbackFont(const FontDescription& fontDescription) +SimpleFontData* FontCache::getLastResortFallbackFont(const FontDescription& fontDescription) { // FIXME: Would be even better to somehow get the user's default font here. // For now we'll pick the default that the user would get without changing any prefs. static AtomicString defaultString("DejaVu Serif"); - return getCachedFontPlatformData(fontDescription, defaultString); + return getCachedFontData(fontDescription, defaultString); } FontPlatformData* FontCache::createFontPlatformData(const FontDescription& fontDescription, const AtomicString& family) |