aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports/SkFontHost_FreeType_common.h
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-03-25 18:17:31 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-03-25 18:17:32 -0700
commit36352bf5e38f45a70ee4f4fc132a38048d38206d (patch)
tree24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /src/ports/SkFontHost_FreeType_common.h
parent02fd592c8d190058652bb715fb34feb7a72992e5 (diff)
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}
NOPRESUBMIT=true BUG=skia: DOCS_PREVIEW= https://skia.org/?cl=1037793002 Review URL: https://codereview.chromium.org/1037793002
Diffstat (limited to 'src/ports/SkFontHost_FreeType_common.h')
-rw-r--r--src/ports/SkFontHost_FreeType_common.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/ports/SkFontHost_FreeType_common.h b/src/ports/SkFontHost_FreeType_common.h
index 57aedd07cf..36efba011d 100644
--- a/src/ports/SkFontHost_FreeType_common.h
+++ b/src/ports/SkFontHost_FreeType_common.h
@@ -59,23 +59,23 @@ protected:
{}
virtual SkScalerContext* onCreateScalerContext(
- const SkDescriptor*) const SK_OVERRIDE;
- void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE;
+ const SkDescriptor*) const override;
+ void onFilterRec(SkScalerContextRec*) const override;
virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
SkAdvancedTypefaceMetrics::PerGlyphInfo,
- const uint32_t*, uint32_t) const SK_OVERRIDE;
- int onGetUPEM() const SK_OVERRIDE;
+ const uint32_t*, uint32_t) const override;
+ int onGetUPEM() const override;
virtual bool onGetKerningPairAdjustments(const uint16_t glyphs[], int count,
- int32_t adjustments[]) const SK_OVERRIDE;
+ int32_t adjustments[]) const override;
virtual int onCharsToGlyphs(const void* chars, Encoding, uint16_t glyphs[],
- int glyphCount) const SK_OVERRIDE;
- int onCountGlyphs() const SK_OVERRIDE;
+ int glyphCount) const override;
+ int onCountGlyphs() const override;
- LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE;
+ LocalizedStrings* onCreateFamilyNameIterator() const override;
- int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE;
+ int onGetTableTags(SkFontTableTag tags[]) const override;
virtual size_t onGetTableData(SkFontTableTag, size_t offset,
- size_t length, void* data) const SK_OVERRIDE;
+ size_t length, void* data) const override;
private:
mutable int fGlyphCount;