diff options
author | 2015-03-25 18:17:31 -0700 | |
---|---|---|
committer | 2015-03-25 18:17:32 -0700 | |
commit | 36352bf5e38f45a70ee4f4fc132a38048d38206d (patch) | |
tree | 24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /src/fonts/SkFontMgr_indirect.cpp | |
parent | 02fd592c8d190058652bb715fb34feb7a72992e5 (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/fonts/SkFontMgr_indirect.cpp')
-rw-r--r-- | src/fonts/SkFontMgr_indirect.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fonts/SkFontMgr_indirect.cpp b/src/fonts/SkFontMgr_indirect.cpp index 5615a78c21..172d5412a6 100644 --- a/src/fonts/SkFontMgr_indirect.cpp +++ b/src/fonts/SkFontMgr_indirect.cpp @@ -25,9 +25,9 @@ public: : fOwner(SkRef(owner)), fFamilyIndex(familyIndex), fData(data) { } - int count() SK_OVERRIDE { return fData->count(); } + int count() override { return fData->count(); } - void getStyle(int index, SkFontStyle* fs, SkString* style) SK_OVERRIDE { + void getStyle(int index, SkFontStyle* fs, SkString* style) override { if (fs) { *fs = fData->at(index).fFontStyle; } @@ -37,11 +37,11 @@ public: } } - SkTypeface* createTypeface(int index) SK_OVERRIDE { + SkTypeface* createTypeface(int index) override { return fOwner->createTypefaceFromFontId(fData->at(index)); } - SkTypeface* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE { + SkTypeface* matchStyle(const SkFontStyle& pattern) override { if (fFamilyIndex >= 0) { SkFontIdentity id = fOwner->fProxy->matchIndexStyle(fFamilyIndex, pattern); return fOwner->createTypefaceFromFontId(id); |