| Index: Source/platform/fonts/FontCache.h
|
| diff --git a/Source/platform/fonts/FontCache.h b/Source/platform/fonts/FontCache.h
|
| index c21d54b27f280b01e9ec9e80a92a3b1124032515..9b6ac54a3e6f6936b2638fbf4fa6e623bba1125e 100644
|
| --- a/Source/platform/fonts/FontCache.h
|
| +++ b/Source/platform/fonts/FontCache.h
|
| @@ -112,10 +112,8 @@ public:
|
| static void addSideloadedFontForTesting(SkTypeface*);
|
| #endif
|
|
|
| -#if ENABLE(OPENTYPE_VERTICAL)
|
| typedef uint32_t FontFileKey;
|
| PassRefPtr<OpenTypeVerticalData> getVerticalData(const FontFileKey&, const FontPlatformData&);
|
| -#endif
|
|
|
| #if OS(ANDROID)
|
| static AtomicString getGenericFamilyNameForScript(const AtomicString& familyName, const FontDescription&);
|
| @@ -130,6 +128,7 @@ public:
|
| };
|
| static void getFontForCharacter(UChar32, const char* preferredLocale, PlatformFallbackFont*);
|
| #endif
|
| + PassRefPtr<SimpleFontData> fontDataFromFontPlatformData(const FontPlatformData*, ShouldRetain = Retain);
|
|
|
| private:
|
| FontCache();
|
| @@ -154,7 +153,6 @@ private:
|
| // Implemented on skia platforms.
|
| PassRefPtr<SkTypeface> createTypeface(const FontDescription&, const FontFaceCreationParams&, CString& name);
|
|
|
| - PassRefPtr<SimpleFontData> fontDataFromFontPlatformData(const FontPlatformData*, ShouldRetain = Retain);
|
| PassRefPtr<SimpleFontData> fallbackOnStandardFontStyle(const FontDescription&, UChar32);
|
|
|
| // Don't purge if this count is > 0;
|
|
|