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

Unified Diff: src/core/SkTypeface.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/SkStream.cpp ('k') | src/core/SkValidatingReadBuffer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkTypeface.cpp
diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp
index 02d2bc89c01ecdebe8a01ccd4a93f3ae3ab2f4b1..75ff58eea87e44bb25cdf2e7595d956d3d25da5b 100644
--- a/src/core/SkTypeface.cpp
+++ b/src/core/SkTypeface.cpp
@@ -29,15 +29,15 @@ public:
protected:
SkEmptyTypeface() : SkTypeface(SkFontStyle(), 0, true) { }
- virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE { return NULL; }
- virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE {
+ SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE { return NULL; }
+ SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE {
return NULL;
}
- virtual void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE { }
+ void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE { }
virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
SkAdvancedTypefaceMetrics::PerGlyphInfo,
const uint32_t*, uint32_t) const SK_OVERRIDE { return NULL; }
- virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE { }
+ void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE { }
virtual int onCharsToGlyphs(const void* chars, Encoding encoding,
uint16_t glyphs[], int glyphCount) const SK_OVERRIDE {
if (glyphs && glyphCount > 0) {
@@ -45,20 +45,20 @@ protected:
}
return 0;
}
- virtual int onCountGlyphs() const SK_OVERRIDE { return 0; };
- virtual int onGetUPEM() const SK_OVERRIDE { return 0; };
+ int onCountGlyphs() const SK_OVERRIDE { return 0; };
+ int onGetUPEM() const SK_OVERRIDE { return 0; };
class EmptyLocalizedStrings : public SkTypeface::LocalizedStrings {
public:
- virtual bool next(SkTypeface::LocalizedString*) SK_OVERRIDE { return false; }
+ bool next(SkTypeface::LocalizedString*) SK_OVERRIDE { return false; }
};
- virtual void onGetFamilyName(SkString* familyName) const SK_OVERRIDE {
+ void onGetFamilyName(SkString* familyName) const SK_OVERRIDE {
familyName->reset();
}
- virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE {
+ SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE {
return SkNEW(EmptyLocalizedStrings);
};
- virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE { return 0; }
- virtual size_t onGetTableData(SkFontTableTag, size_t, size_t, void*) const SK_OVERRIDE {
+ int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE { return 0; }
+ size_t onGetTableData(SkFontTableTag, size_t, size_t, void*) const SK_OVERRIDE {
return 0;
}
};
« no previous file with comments | « src/core/SkStream.cpp ('k') | src/core/SkValidatingReadBuffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698