diff options
| author | Steve Block <steveblock@google.com> | 2010-02-15 12:59:58 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-16 11:48:33 +0000 |
| commit | 477d5d728b7ab5d2a4fbefc981a5b5d41e15f187 (patch) | |
| tree | 0dca23442ec457da3c080e82f29e07fdd9e4798a /WebCore/platform/graphics | |
| parent | 5deb7f56f14127415f226e241dbb608d51562d6a (diff) | |
| download | external_webkit-477d5d728b7ab5d2a4fbefc981a5b5d41e15f187.zip external_webkit-477d5d728b7ab5d2a4fbefc981a5b5d41e15f187.tar.gz external_webkit-477d5d728b7ab5d2a4fbefc981a5b5d41e15f187.tar.bz2 | |
Merge webkit.org at r54731 : Refactoring in font cache
See http://trac.webkit.org/changeset/54601
Change-Id: Id463962ae17e6d980122bfb0456b29c65b3bf69a
Diffstat (limited to 'WebCore/platform/graphics')
| -rw-r--r-- | WebCore/platform/graphics/android/FontCacheAndroid.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/platform/graphics/android/FontCacheAndroid.cpp b/WebCore/platform/graphics/android/FontCacheAndroid.cpp index ef795de..6ec72c9 100644 --- a/WebCore/platform/graphics/android/FontCacheAndroid.cpp +++ b/WebCore/platform/graphics/android/FontCacheAndroid.cpp @@ -47,15 +47,15 @@ const SimpleFontData* FontCache::getFontDataForCharacters(const Font& font, cons return font.primaryFont(); } -FontPlatformData* FontCache::getSimilarFontPlatformData(const Font& font) +SimpleFontData* FontCache::getSimilarFontPlatformData(const Font& font) { return 0; } -FontPlatformData* FontCache::getLastResortFallbackFont(const FontDescription& font) +SimpleFontData* FontCache::getLastResortFallbackFont(const FontDescription& font) { static AtomicString str("sans-serif"); - return getCachedFontPlatformData(font, str); + return getCachedFontData(font, str); } static char* AtomicStringToUTF8String(const AtomicString& utf16) |