diff options
Diffstat (limited to 'src/ports/SkFontHost_mac.cpp')
-rwxr-xr-x | src/ports/SkFontHost_mac.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp index 8d3a6fac86..f12785d106 100755 --- a/src/ports/SkFontHost_mac.cpp +++ b/src/ports/SkFontHost_mac.cpp @@ -468,22 +468,22 @@ public: protected: friend class SkFontHost; // to access our protected members for deprecated methods - virtual int onGetUPEM() const SK_OVERRIDE; - virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE; - virtual void onGetFamilyName(SkString* familyName) const SK_OVERRIDE; - virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE; - virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE; + int onGetUPEM() const SK_OVERRIDE; + SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE; + void onGetFamilyName(SkString* familyName) const SK_OVERRIDE; + SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE; + int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE; virtual size_t onGetTableData(SkFontTableTag, size_t offset, size_t length, void* data) const SK_OVERRIDE; - virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE; - virtual void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE; - virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE; + SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE; + void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE; + void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE; virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( SkAdvancedTypefaceMetrics::PerGlyphInfo, const uint32_t*, uint32_t) const SK_OVERRIDE; virtual int onCharsToGlyphs(const void* chars, Encoding, uint16_t glyphs[], int glyphCount) const SK_OVERRIDE; - virtual int onCountGlyphs() const SK_OVERRIDE; + int onCountGlyphs() const SK_OVERRIDE; private: bool fIsLocalStream; @@ -2109,11 +2109,11 @@ public: CFRelease(fFamilyName); } - virtual int count() SK_OVERRIDE { + int count() SK_OVERRIDE { return fCount; } - virtual void getStyle(int index, SkFontStyle* style, SkString* name) SK_OVERRIDE { + void getStyle(int index, SkFontStyle* style, SkString* name) SK_OVERRIDE { SkASSERT((unsigned)index < (unsigned)fCount); CTFontDescriptorRef desc = (CTFontDescriptorRef)CFArrayGetValueAtIndex(fArray, index); if (style) { @@ -2126,14 +2126,14 @@ public: } } - virtual SkTypeface* createTypeface(int index) SK_OVERRIDE { + SkTypeface* createTypeface(int index) SK_OVERRIDE { SkASSERT((unsigned)index < (unsigned)CFArrayGetCount(fArray)); CTFontDescriptorRef desc = (CTFontDescriptorRef)CFArrayGetValueAtIndex(fArray, index); return createFromDesc(fFamilyName, desc); } - virtual SkTypeface* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE { + SkTypeface* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE { if (0 == fCount) { return NULL; } @@ -2197,11 +2197,11 @@ public: } protected: - virtual int onCountFamilies() const SK_OVERRIDE { + int onCountFamilies() const SK_OVERRIDE { return fCount; } - virtual void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE { + void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE { if ((unsigned)index < (unsigned)fCount) { CFStringToSkString(this->stringAt(index), familyName); } else { @@ -2209,14 +2209,14 @@ protected: } } - virtual SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE { + SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE { if ((unsigned)index >= (unsigned)fCount) { return NULL; } return CreateSet(this->stringAt(index)); } - virtual SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE { + SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE { AutoCFRelease<CFStringRef> cfName(make_CFString(familyName)); return CreateSet(cfName); } @@ -2237,7 +2237,7 @@ protected: return NULL; } - virtual SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE { + SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE { AutoCFRelease<CGDataProviderRef> pr(SkCreateDataProviderFromData(data)); if (NULL == pr) { return NULL; @@ -2245,7 +2245,7 @@ protected: return create_from_dataProvider(pr); } - virtual SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE { + SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE { AutoCFRelease<CGDataProviderRef> pr(SkCreateDataProviderFromStream(stream)); if (NULL == pr) { return NULL; @@ -2253,7 +2253,7 @@ protected: return create_from_dataProvider(pr); } - virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE { + SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE { AutoCFRelease<CGDataProviderRef> pr(CGDataProviderCreateWithFilename(path)); if (NULL == pr) { return NULL; |