diff options
Diffstat (limited to 'Source/WebCore/platform/graphics/wince/FontCacheWinCE.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/wince/FontCacheWinCE.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/Source/WebCore/platform/graphics/wince/FontCacheWinCE.cpp b/Source/WebCore/platform/graphics/wince/FontCacheWinCE.cpp index 86c61455a..7641edd2d 100644 --- a/Source/WebCore/platform/graphics/wince/FontCacheWinCE.cpp +++ b/Source/WebCore/platform/graphics/wince/FontCacheWinCE.cpp @@ -225,7 +225,7 @@ void FontCache::comUninitialize() } } -const SimpleFontData* FontCache::getFontDataForCharacters(const Font& font, const UChar* characters, int length) +PassRefPtr<SimpleFontData> FontCache::getFontDataForCharacters(const Font& font, const UChar* characters, int length) { String familyName; WCHAR name[LF_FACESIZE]; @@ -235,10 +235,11 @@ const SimpleFontData* FontCache::getFontDataForCharacters(const Font& font, cons unsigned unicodeRange = findCharUnicodeRange(character); #if defined(IMLANG_FONT_LINK) && (IMLANG_FONT_LINK == 2) - if (IMLangFontLink2* langFontLink = getFontLinkInterface()) { + if (IMLangFontLink2* langFontLink = getFontLinkInterface()) #else - if (IMLangFontLink* langFontLink = getFontLinkInterface()) { + if (IMLangFontLink* langFontLink = getFontLinkInterface()) #endif + { HGDIOBJ oldFont = GetCurrentObject(g_screenDC, OBJ_FONT); HFONT hfont = 0; DWORD codePages = 0; @@ -267,10 +268,11 @@ const SimpleFontData* FontCache::getFontDataForCharacters(const Font& font, cons // We asked about a code page that is not one of the code pages // returned by MLang, so the font might not contain the character. #if defined(IMLANG_FONT_LINK) && (IMLANG_FONT_LINK == 2) - if (!currentFontContainsCharacter(langFontLink, g_screenDC, character)) { + if (!currentFontContainsCharacter(langFontLink, g_screenDC, character)) #else - if (!currentFontContainsCharacter(langFontLink, g_screenDC, hfont, character, name)) { + if (!currentFontContainsCharacter(langFontLink, g_screenDC, hfont, character, name)) #endif + { SelectObject(g_screenDC, oldFont); langFontLink->ReleaseFont(hfont); hfont = 0; @@ -308,20 +310,20 @@ const SimpleFontData* FontCache::getFontDataForCharacters(const Font& font, cons FontPlatformData* result = getCachedFontPlatformData(fontDescription, familyName); if (result && result->hash() != origFont.hash()) { - if (SimpleFontData* fontData = getCachedFontData(result, DoNotRetain)) - return fontData; + if (RefPtr<SimpleFontData> fontData = getCachedFontData(result, DoNotRetain)) + return fontData.release(); } } return 0; } -SimpleFontData* FontCache::getSimilarFontPlatformData(const Font& font) +PassRefPtr<SimpleFontData> FontCache::getSimilarFontPlatformData(const Font&) { return 0; } -SimpleFontData* FontCache::getLastResortFallbackFont(const FontDescription& fontDesc, ShouldRetain shouldRetain) +PassRefPtr<SimpleFontData> FontCache::getLastResortFallbackFont(const FontDescription& fontDesc, ShouldRetain shouldRetain) { // 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. |