| Index: src/fonts/SkTestScalerContext.h
|
| diff --git a/src/fonts/SkTestScalerContext.h b/src/fonts/SkTestScalerContext.h
|
| index 28ab02d4fd60d897c3766a30a9b4d08d6fa90fba..573a3df21241244d0376e80bc8f2fee4f2613824 100644
|
| --- a/src/fonts/SkTestScalerContext.h
|
| +++ b/src/fonts/SkTestScalerContext.h
|
| @@ -68,10 +68,10 @@ public:
|
| protected:
|
| 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 override;
|
| + SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
|
| + SkAdvancedTypefaceMetrics::PerGlyphInfo,
|
| + const uint32_t* glyphIDs,
|
| + uint32_t glyphIDsCount) const override;
|
|
|
| SkStreamAsset* onOpenStream(int* ttcIndex) const override {
|
| SkASSERT(0); // don't expect to get here
|
| @@ -80,8 +80,8 @@ protected:
|
|
|
| void onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const override;
|
|
|
| - virtual int onCharsToGlyphs(const void* chars, Encoding encoding,
|
| - uint16_t glyphs[], int glyphCount) const override;
|
| + int onCharsToGlyphs(const void* chars, Encoding encoding,
|
| + uint16_t glyphs[], int glyphCount) const override;
|
|
|
| int onCountGlyphs() const override {
|
| return (int) fTestFont->fCharCodesCount;
|
| @@ -99,8 +99,8 @@ protected:
|
| return 0;
|
| }
|
|
|
| - virtual size_t onGetTableData(SkFontTableTag tag, size_t offset,
|
| - size_t length, void* data) const override {
|
| + size_t onGetTableData(SkFontTableTag tag, size_t offset,
|
| + size_t length, void* data) const override {
|
| return 0;
|
| }
|
| private:
|
|
|