| Index: src/fonts/SkGScalerContext.h
|
| diff --git a/src/fonts/SkGScalerContext.h b/src/fonts/SkGScalerContext.h
|
| index 8ad28173c09af86ed7571a6f5339cd25c6bdbae4..54af3c39d378e458f446d2cf934a137f1de556a1 100644
|
| --- a/src/fonts/SkGScalerContext.h
|
| +++ b/src/fonts/SkGScalerContext.h
|
| @@ -20,24 +20,24 @@ public:
|
| const SkPaint& paint() const { return fPaint; }
|
|
|
| protected:
|
| - virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE;
|
| - virtual void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE;
|
| + SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE;
|
| + void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE;
|
| virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
|
| SkAdvancedTypefaceMetrics::PerGlyphInfo,
|
| const uint32_t* glyphIDs,
|
| uint32_t glyphIDsCount) const SK_OVERRIDE;
|
| - virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE;
|
| - virtual void onGetFontDescriptor(SkFontDescriptor*, bool* isLocal) const SK_OVERRIDE;
|
| + SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE;
|
| + void onGetFontDescriptor(SkFontDescriptor*, bool* isLocal) const SK_OVERRIDE;
|
|
|
| virtual int onCharsToGlyphs(const void* chars, Encoding encoding,
|
| uint16_t glyphs[], int glyphCount) const SK_OVERRIDE;
|
| - virtual int onCountGlyphs() const SK_OVERRIDE;
|
| - virtual int onGetUPEM() const SK_OVERRIDE;
|
| + int onCountGlyphs() const SK_OVERRIDE;
|
| + int onGetUPEM() const SK_OVERRIDE;
|
|
|
| - virtual void onGetFamilyName(SkString* familyName) const SK_OVERRIDE;
|
| - virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE;
|
| + void onGetFamilyName(SkString* familyName) const SK_OVERRIDE;
|
| + SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE;
|
|
|
| - virtual int onGetTableTags(SkFontTableTag tags[]) 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;
|
|
|
|
|