diff options
Diffstat (limited to 'Source/WebCore/platform/graphics/skia/FontCacheSkia.cpp')
-rw-r--r-- | Source/WebCore/platform/graphics/skia/FontCacheSkia.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/Source/WebCore/platform/graphics/skia/FontCacheSkia.cpp b/Source/WebCore/platform/graphics/skia/FontCacheSkia.cpp index 271c3d7e9..336abc430 100644 --- a/Source/WebCore/platform/graphics/skia/FontCacheSkia.cpp +++ b/Source/WebCore/platform/graphics/skia/FontCacheSkia.cpp @@ -30,20 +30,16 @@ #include "config.h" #include "FontCache.h" - #include "Font.h" #include "FontDescription.h" #include "FontFamily.h" #include "FontPlatformData.h" #include "Logging.h" #include "NotImplemented.h" -#include "PlatformSupport.h" #include "SimpleFontData.h" - #include "SkPaint.h" #include "SkTypeface.h" #include "SkUtils.h" - #include <unicode/locid.h> #include <wtf/Assertions.h> #include <wtf/text/AtomicString.h> @@ -55,9 +51,7 @@ void FontCache::platformInit() { } -const SimpleFontData* FontCache::getFontDataForCharacters(const Font& font, - const UChar* characters, - int length) +PassRefPtr<SimpleFontData> FontCache::getFontDataForCharacters(const Font& font, const UChar* characters, int length) { icu::Locale locale = icu::Locale::getDefault(); FontCache::SimpleFontFamily family; @@ -94,12 +88,12 @@ const SimpleFontData* FontCache::getFontDataForCharacters(const Font& font, return getCachedFontData(&platformData, DoNotRetain); } -SimpleFontData* FontCache::getSimilarFontPlatformData(const Font& font) +PassRefPtr<SimpleFontData> FontCache::getSimilarFontPlatformData(const Font& font) { return 0; } -SimpleFontData* FontCache::getLastResortFallbackFont(const FontDescription& description, ShouldRetain shouldRetain) +PassRefPtr<SimpleFontData> FontCache::getLastResortFallbackFont(const FontDescription& description, ShouldRetain shouldRetain) { DEFINE_STATIC_LOCAL(const AtomicString, sansStr, ("Sans")); DEFINE_STATIC_LOCAL(const AtomicString, serifStr, ("Serif")); |