Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Unified Diff: include/ports/SkFontMgr_indirect.h

Issue 806653007: Fix up all the easy virtual ... SK_OVERRIDE cases. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/pdf/SkPDFDevice.h ('k') | include/utils/SkDeferredCanvas.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/ports/SkFontMgr_indirect.h
diff --git a/include/ports/SkFontMgr_indirect.h b/include/ports/SkFontMgr_indirect.h
index 573c7eb54012ce51474efe6f8c6397cce74e1611..ad89b71ab5aee7f8cc43cd70df3ffef35b128316 100644
--- a/include/ports/SkFontMgr_indirect.h
+++ b/include/ports/SkFontMgr_indirect.h
@@ -30,11 +30,11 @@ public:
{ }
protected:
- virtual int onCountFamilies() const SK_OVERRIDE;
- virtual void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE;
- virtual SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE;
+ int onCountFamilies() const SK_OVERRIDE;
+ void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE;
+ SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE;
- virtual SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE;
+ SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE;
virtual SkTypeface* onMatchFamilyStyle(const char familyName[],
const SkFontStyle& fontStyle) const SK_OVERRIDE;
@@ -48,9 +48,9 @@ protected:
virtual SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember,
const SkFontStyle& fontStyle) const SK_OVERRIDE;
- virtual SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE;
- virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE;
- virtual SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE;
+ SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE;
+ SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE;
+ SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE;
virtual SkTypeface* onLegacyCreateTypeface(const char familyName[],
unsigned styleBits) const SK_OVERRIDE;
« no previous file with comments | « include/pdf/SkPDFDevice.h ('k') | include/utils/SkDeferredCanvas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698