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

Unified Diff: src/fonts/SkTestScalerContext.h

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 9 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/fonts/SkGScalerContext.cpp ('k') | src/fonts/SkTestScalerContext.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/fonts/SkTestScalerContext.h
diff --git a/src/fonts/SkTestScalerContext.h b/src/fonts/SkTestScalerContext.h
index 49e9b779a5b44ed81bf60e350415f3c8b5029cf5..28ab02d4fd60d897c3766a30a9b4d08d6fa90fba 100644
--- a/src/fonts/SkTestScalerContext.h
+++ b/src/fonts/SkTestScalerContext.h
@@ -66,41 +66,41 @@ public:
void getMetrics(SkGlyph* glyph);
void getPath(const SkGlyph& glyph, SkPath* path);
protected:
- SkScalerContext* onCreateScalerContext(const SkDescriptor* desc) const SK_OVERRIDE;
- void onFilterRec(SkScalerContextRec* rec) const SK_OVERRIDE;
+ SkScalerContext* onCreateScalerContext(const SkDescriptor* desc) const override;
+ void onFilterRec(SkScalerContextRec* rec) const override;
virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
SkAdvancedTypefaceMetrics::PerGlyphInfo ,
const uint32_t* glyphIDs,
- uint32_t glyphIDsCount) const SK_OVERRIDE;
+ uint32_t glyphIDsCount) const override;
- SkStreamAsset* onOpenStream(int* ttcIndex) const SK_OVERRIDE {
+ SkStreamAsset* onOpenStream(int* ttcIndex) const override {
SkASSERT(0); // don't expect to get here
return NULL;
}
- void onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const SK_OVERRIDE;
+ void onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const override;
virtual int onCharsToGlyphs(const void* chars, Encoding encoding,
- uint16_t glyphs[], int glyphCount) const SK_OVERRIDE;
+ uint16_t glyphs[], int glyphCount) const override;
- int onCountGlyphs() const SK_OVERRIDE {
+ int onCountGlyphs() const override {
return (int) fTestFont->fCharCodesCount;
}
- int onGetUPEM() const SK_OVERRIDE {
+ int onGetUPEM() const override {
SkASSERT(0); // don't expect to get here
return 1;
}
- void onGetFamilyName(SkString* familyName) const SK_OVERRIDE;
- SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE;
+ void onGetFamilyName(SkString* familyName) const override;
+ SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override;
- int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE {
+ int onGetTableTags(SkFontTableTag tags[]) const override {
return 0;
}
virtual size_t onGetTableData(SkFontTableTag tag, size_t offset,
- size_t length, void* data) const SK_OVERRIDE {
+ size_t length, void* data) const override {
return 0;
}
private:
« no previous file with comments | « src/fonts/SkGScalerContext.cpp ('k') | src/fonts/SkTestScalerContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698