diff options
Diffstat (limited to 'Source/WebCore/platform/graphics/qt/FontCacheQt.cpp')
-rw-r--r-- | Source/WebCore/platform/graphics/qt/FontCacheQt.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/platform/graphics/qt/FontCacheQt.cpp b/Source/WebCore/platform/graphics/qt/FontCacheQt.cpp index b58198fa3..6d1ee72f2 100644 --- a/Source/WebCore/platform/graphics/qt/FontCacheQt.cpp +++ b/Source/WebCore/platform/graphics/qt/FontCacheQt.cpp @@ -25,9 +25,9 @@ #include "config.h" #include "FontCache.h" +#include "Font.h" #include "FontDescription.h" #include "FontPlatformData.h" -#include "Font.h" #include <utility> #include <wtf/ListHashSet.h> #include <wtf/StdLibExtras.h> @@ -63,7 +63,7 @@ static QRawFont rawFontForCharacters(const QString& string, const QRawFont& font return glyphs.rawFont(); } -const SimpleFontData* FontCache::getFontDataForCharacters(const Font& font, const UChar* characters, int length) +PassRefPtr<SimpleFontData> FontCache::getFontDataForCharacters(const Font& font, const UChar* characters, int length) { QString qstring = QString::fromRawData(reinterpret_cast<const QChar*>(characters), length); QRawFont computedFont = rawFontForCharacters(qstring, font.rawFont()); @@ -73,12 +73,12 @@ const SimpleFontData* FontCache::getFontDataForCharacters(const Font& font, cons return getCachedFontData(&alternateFont, DoNotRetain); } -SimpleFontData* FontCache::getSimilarFontPlatformData(const Font& font) +PassRefPtr<SimpleFontData> FontCache::getSimilarFontPlatformData(const Font& font) { return 0; } -SimpleFontData* FontCache::getLastResortFallbackFont(const FontDescription& fontDescription, ShouldRetain shouldRetain) +PassRefPtr<SimpleFontData> FontCache::getLastResortFallbackFont(const FontDescription& fontDescription, ShouldRetain shouldRetain) { const AtomicString fallbackFamily = QFont(fontDescription.family().family()).lastResortFamily(); return getCachedFontData(new FontPlatformData(fontDescription, fallbackFamily), shouldRetain); |