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

Unified Diff: src/core/SkFontHost.cpp

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 | « src/core/SkFilterShader.h ('k') | src/core/SkImageFilter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkFontHost.cpp
diff --git a/src/core/SkFontHost.cpp b/src/core/SkFontHost.cpp
index 79b7b7302e23002db8be55b547c32fd03495bcd4..8092a590c24a1e21ef2852caccb91a2665ec90e3 100644
--- a/src/core/SkFontHost.cpp
+++ b/src/core/SkFontHost.cpp
@@ -80,15 +80,15 @@ SkFontStyle::SkFontStyle(unsigned oldStyle) {
class SkEmptyFontStyleSet : public SkFontStyleSet {
public:
- virtual int count() SK_OVERRIDE { return 0; }
- virtual void getStyle(int, SkFontStyle*, SkString*) SK_OVERRIDE {
+ int count() SK_OVERRIDE { return 0; }
+ void getStyle(int, SkFontStyle*, SkString*) SK_OVERRIDE {
SkDEBUGFAIL("SkFontStyleSet::getStyle called on empty set");
}
- virtual SkTypeface* createTypeface(int index) SK_OVERRIDE {
+ SkTypeface* createTypeface(int index) SK_OVERRIDE {
SkDEBUGFAIL("SkFontStyleSet::createTypeface called on empty set");
return NULL;
}
- virtual SkTypeface* matchStyle(const SkFontStyle&) SK_OVERRIDE {
+ SkTypeface* matchStyle(const SkFontStyle&) SK_OVERRIDE {
return NULL;
}
};
@@ -101,17 +101,17 @@ SkFontStyleSet* SkFontStyleSet::CreateEmpty() {
class SkEmptyFontMgr : public SkFontMgr {
protected:
- virtual int onCountFamilies() const SK_OVERRIDE {
+ int onCountFamilies() const SK_OVERRIDE {
return 0;
}
- virtual void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE {
+ void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE {
SkDEBUGFAIL("onGetFamilyName called with bad index");
}
- virtual SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE {
+ SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE {
SkDEBUGFAIL("onCreateStyleSet called with bad index");
return NULL;
}
- virtual SkFontStyleSet* onMatchFamily(const char[]) const SK_OVERRIDE {
+ SkFontStyleSet* onMatchFamily(const char[]) const SK_OVERRIDE {
return SkFontStyleSet::CreateEmpty();
}
@@ -130,16 +130,16 @@ protected:
const SkFontStyle&) const SK_OVERRIDE {
return NULL;
}
- virtual SkTypeface* onCreateFromData(SkData*, int) const SK_OVERRIDE {
+ SkTypeface* onCreateFromData(SkData*, int) const SK_OVERRIDE {
return NULL;
}
- virtual SkTypeface* onCreateFromStream(SkStream*, int) const SK_OVERRIDE {
+ SkTypeface* onCreateFromStream(SkStream*, int) const SK_OVERRIDE {
return NULL;
}
- virtual SkTypeface* onCreateFromFile(const char[], int) const SK_OVERRIDE {
+ SkTypeface* onCreateFromFile(const char[], int) const SK_OVERRIDE {
return NULL;
}
- virtual SkTypeface* onLegacyCreateTypeface(const char [], unsigned) const SK_OVERRIDE {
+ SkTypeface* onLegacyCreateTypeface(const char [], unsigned) const SK_OVERRIDE {
return NULL;
}
};
« no previous file with comments | « src/core/SkFilterShader.h ('k') | src/core/SkImageFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698