AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update {virtual,override} to follow C++11 style in src/fonts.

Browse Source 
The Google style guide states that only one of {virtual,override,final}
should be used for each declaration, since override implies virtual and
final implies both virtual and override.

The entries were found using the following command line:

$ find src/fonts -iname "*.h" -o -iname "*.cpp" | xargs pcregrep -M
"[^\n/]+virtual\ [^;{]+\ [a-zA-Z0-9_]+\([^;{]+\ override[ \n]*[;{]"

The regex was a courtesy of nick@chromium.org

BUG=None
R=mtklein@google.com

Review URL: https://codereview.chromium.org/1101343002
This commit is contained in:
tfarina 2015-04-24 14:25:33 -07:00 committed by Commit bot
parent d96fd0c073
commit 37a92b4437
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/fonts/SkFontMgr_fontconfig.cpp
View File

@ -283,15 +283,15 @@ protected:
return sset; return sset;
} }
virtual SkTypeface* onMatchFamilyStyle(const char familyName[], SkTypeface* onMatchFamilyStyle(const char familyName[],
const SkFontStyle&) const override { return NULL; } const SkFontStyle&) const override { return NULL; }
virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[], const SkFontStyle&, SkTypeface* onMatchFamilyStyleCharacter(const char familyName[], const SkFontStyle&,
const char* bcp47[], int bcp47Count, const char* bcp47[], int bcp47Count,
SkUnichar character) const override { SkUnichar character) const override {
return NULL; return NULL;
} }
virtual SkTypeface* onMatchFaceStyle(const SkTypeface*, SkTypeface* onMatchFaceStyle(const SkTypeface*,
const SkFontStyle&) const override { return NULL; } const SkFontStyle&) const override { return NULL; }
SkTypeface* onCreateFromData(SkData*, int ttcIndex) const override { return NULL; } SkTypeface* onCreateFromData(SkData*, int ttcIndex) const override { return NULL; }
@ -321,8 +321,8 @@ protected:
return stream.get() ? this->createFromStream(stream.detach(), ttcIndex) : NULL; return stream.get() ? this->createFromStream(stream.detach(), ttcIndex) : NULL;
} }
virtual SkTypeface* onLegacyCreateTypeface(const char familyName[], SkTypeface* onLegacyCreateTypeface(const char familyName[],
unsigned styleBits) const override { unsigned styleBits) const override {
FCLocker lock; FCLocker lock;
return FontConfigTypeface::LegacyCreateTypeface(familyName, (SkTypeface::Style)styleBits); return FontConfigTypeface::LegacyCreateTypeface(familyName, (SkTypeface::Style)styleBits);
} }

16
src/fonts/SkGScalerContext.h
View File

@ -22,15 +22,15 @@ public:
protected: protected:
SkScalerContext* onCreateScalerContext(const SkDescriptor*) const override; SkScalerContext* onCreateScalerContext(const SkDescriptor*) const override;
void onFilterRec(SkScalerContextRec*) const override; void onFilterRec(SkScalerContextRec*) const override;
virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
SkAdvancedTypefaceMetrics::PerGlyphInfo, SkAdvancedTypefaceMetrics::PerGlyphInfo,
const uint32_t* glyphIDs, const uint32_t* glyphIDs,
uint32_t glyphIDsCount) const override; uint32_t glyphIDsCount) const override;
SkStreamAsset* onOpenStream(int* ttcIndex) const override; SkStreamAsset* onOpenStream(int* ttcIndex) const override;
void onGetFontDescriptor(SkFontDescriptor*, bool* isLocal) const override; void onGetFontDescriptor(SkFontDescriptor*, bool* isLocal) const override;
virtual int onCharsToGlyphs(const void* chars, Encoding encoding, int onCharsToGlyphs(const void* chars, Encoding encoding,
uint16_t glyphs[], int glyphCount) const override; uint16_t glyphs[], int glyphCount) const override;
int onCountGlyphs() const override; int onCountGlyphs() const override;
int onGetUPEM() const override; int onGetUPEM() const override;
@ -38,8 +38,8 @@ protected:
SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override; SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override;
int onGetTableTags(SkFontTableTag tags[]) const override; int onGetTableTags(SkFontTableTag tags[]) const override;
virtual size_t onGetTableData(SkFontTableTag, size_t offset, size_t onGetTableData(SkFontTableTag, size_t offset,
size_t length, void* data) const override; size_t length, void* data) const override;
private: private:
SkTypeface* fProxy; SkTypeface* fProxy;

16
src/fonts/SkTestScalerContext.h
View File

@ -68,10 +68,10 @@ public:
protected: protected:
SkScalerContext* onCreateScalerContext(const SkDescriptor* desc) const override; SkScalerContext* onCreateScalerContext(const SkDescriptor* desc) const override;
void onFilterRec(SkScalerContextRec* rec) const override; void onFilterRec(SkScalerContextRec* rec) const override;
virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
SkAdvancedTypefaceMetrics::PerGlyphInfo , SkAdvancedTypefaceMetrics::PerGlyphInfo,
const uint32_t* glyphIDs, const uint32_t* glyphIDs,
uint32_t glyphIDsCount) const override; uint32_t glyphIDsCount) const override;
SkStreamAsset* onOpenStream(int* ttcIndex) const override { SkStreamAsset* onOpenStream(int* ttcIndex) const override {
SkASSERT(0); // don't expect to get here SkASSERT(0); // don't expect to get here
@ -80,8 +80,8 @@ protected:
void onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const override; void onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const override;
virtual int onCharsToGlyphs(const void* chars, Encoding encoding, int onCharsToGlyphs(const void* chars, Encoding encoding,
uint16_t glyphs[], int glyphCount) const override; uint16_t glyphs[], int glyphCount) const override;
int onCountGlyphs() const override { int onCountGlyphs() const override {
return (int) fTestFont->fCharCodesCount; return (int) fTestFont->fCharCodesCount;
@ -99,8 +99,8 @@ protected:
return 0; return 0;
} }
virtual size_t onGetTableData(SkFontTableTag tag, size_t offset, size_t onGetTableData(SkFontTableTag tag, size_t offset,
size_t length, void* data) const override { size_t length, void* data) const override {
return 0; return 0;
} }
private: private: